Index: bugs/include/format-html.php
===================================================================
--- bugs/include/format-html.php	(revision 284454)
+++ bugs/include/format-html.php	(working copy)
@@ -24,6 +24,9 @@
 if (empty($dbh))
 {
     $dbh = MDB2::factory(PEAR_DATABASE_DSN);
+    if (PEAR::isError($dbh)) {
+        trigger_error($dbh->message." [".$dbh->userinfo."]", E_USER_ERROR);
+    }
     $dbh->loadModule('Extended');
 }
 
@@ -121,7 +124,7 @@
   </td>
   <td class="head-menu">
 
-<?php 
+<?php
 
 if ($site == 'php') {
         print_link('http://www.php.net/', 'php.net', false, 'class="menuWhite"');
@@ -137,7 +140,7 @@
         print_link('search-howto.php', 'search howto', false, 'class="menuWhite"');
         echo delim();
         print_link('stats.php', 'statistics', false, 'class="menuWhite"');
-} else { 
+} else {
 
     if (!$logged_in) {
         print_link('/account-request.php', 'Register', false, 'class="menuBlack"');
@@ -179,7 +182,7 @@
 	}
     echo delim();
     print_link("{$basedir}/", 'Bugs', false, 'class="menuBlack"');
-} 
+}
 
 ?>
   </td>
@@ -887,7 +890,7 @@
 function make_image($file, $alt = '', $align = '', $extras = '', $dir = '', $border = 0, $styles = '')
 {
 	global $basedir, $main_include_path;
-	
+
     if (!$dir) {
     	$dir = '/gifs';
         $img_dir = "{$basedir}/gifs";
@@ -951,7 +954,7 @@
 function make_ticket_links($text)
 {
 	global $site_url, $basedir, $site_data;
-	
+
 	// PHP
 	$url = "{$site_data['php']['url']}{$site_data['php']['basedir']}";
     $text = preg_replace('/(?<=php)\s*(bug(?:fix)?|feat(?:ure)?|doc(?:umentation)?|req(?:uest)?)\s+#?([0-9]+)/i',
Index: bugs/include/functions.inc
===================================================================
--- bugs/include/functions.inc	(revision 284454)
+++ bugs/include/functions.inc	(working copy)
@@ -74,7 +74,7 @@
  * DEFINE FUNCTIONS ============================
  */
 
-/** 
+/**
  * Authentication
  */
 function bugs_authenticate (&$user, &$pw, &$logged_in, &$is_trusted_developer)
@@ -100,29 +100,29 @@
 		}
 		$pw = $_POST['pw'];
 
-		// Remember password / user next time 
+		// Remember password / user next time
 		if (isset($_POST['save'])) { # non-developers don't have $user set
 			setcookie('MAGIC_COOKIE', base64_encode("{$user}:{$pw}"), time() + 3600 * 24 * 12, '/','.php.net');
 		}
 	} elseif (isset($auth_user) && is_object($auth_user) && $auth_user->handle) {
-		$user = $auth_user->handle;  
+		$user = $auth_user->handle;
 		$pw   = $auth_user->password;
 	} elseif (isset($_COOKIE['MAGIC_COOKIE'])) {
 		@list($user, $pw) = explode(':', base64_decode($_COOKIE['MAGIC_COOKIE']));
 		if ($pw === null) {
 			$pw = '';
-		}   
+		}
 	}
 
 	// Authentication and user level check
-	// User levels are: reader (0), commenter/patcher/etc. (edit = 3), submitter (edit = 2), developer (edit = 1) 
+	// User levels are: reader (0), commenter/patcher/etc. (edit = 3), submitter (edit = 2), developer (edit = 1)
 	switch ($site)
 	{
 		case 'php':
 			// Only used for bugs.php.net
 			require_once 'cvs-auth.inc';
 			if ($user != '' && $pw != '' && verify_cvs_password($user, $pw)) {
-				$logged_in = 'developer';  
+				$logged_in = 'developer';
 				$auth_user->handle = $user;
 				$auth_user->email  = "{$user}@php.net";
 				$auth_user->name   = $user;
@@ -523,7 +523,7 @@
         if ($current == $v[0]) {
             echo ' selected="selected"';
         }
-		
+
         echo ' value = "' . htmlspecialchars($v[0]) . '">' . htmlspecialchars($v[0]) . ' (' . htmlspecialchars($v[1]) . ")</option>\n";
     }
     echo '<option value="CVS"';
@@ -855,7 +855,7 @@
                   "X-PHP-Bug: {$bug['id']}\n".
                   "In-Reply-To: <bug-{$bug['id']}@{$site_url}>",
                   "-fbounces-ignored@php.net");
-          
+
 		// but we go ahead and let the default sender get used for the list
 
             @mail($mailto,
@@ -1236,7 +1236,7 @@
     $style['CRSLR']    = ($status == 'CRSLR')   ?' class="status_active"':'';
     echo '<td style="text-align: right;">' . "\n Status: ";
     if (!$fulllink) {
-        $fulllink = "{$basedir}/search.php?cmd=display&amp;{$pkgs}"; 
+        $fulllink = "{$basedir}/search.php?cmd=display&amp;{$pkgs}";
     }
     echo make_link("{$fulllink}&amp;status=Open", 'Open', '', $style['Open']);
     echo delim();
@@ -1354,7 +1354,7 @@
 
 
 /**
- * Fetch bug resolves 
+ * Fetch bug resolves
  *
  * @return array array of resolves
  */
Index: bugs/include/prepend.inc
===================================================================
--- bugs/include/prepend.inc	(revision 284454)
+++ bugs/include/prepend.inc	(working copy)
@@ -19,15 +19,20 @@
  */
 
 // magic_quotes_gpc is no longer supported!
-if (get_magic_quotes_gpc()) {
+if (get_magic_quotes_runtime()) {
 	die('Turn off "magic_quotes_gpc" in php.ini!');
 }
 
-// FIXME: Configuration should be elsewhere!
+// This is required because MDB2 is b0rken
+error_reporting(E_ALL ^E_DEPRECATED);
 
 // CONFIG START
-$site = 'php'; // This can be one of php, pear or pecl.
+// Do not change configuration settings here - these are defaults.
+// Instead crate a file `config_local.php` and override settings therein.
 
+// This can be one of php, pear or pecl.
+$site = 'php';
+
 $site_data = array (
 	'php' => array (
 		'url' => 'bugs.php.net',
@@ -35,10 +40,11 @@
 		'email' => 'php-bugs@lists.php.net',
 		'security_email' => 'security@php.net',
 		'db' => 'phpbugsdb',
+    'db_driver' => 'mysqli',
 		'db_user' => 'nobody',
 		'db_pass' => '',
 		'db_host' => 'localhost',
-		'patch_tmp' => '/tmp/patches/', 
+		'patch_tmp' => '/tmp/patches/',
 	),
 	'pear' => array (
 		'url' => 'pear.php.net',
@@ -46,10 +52,11 @@
 		'email' => 'pear-bugs@lists.php.net',
 		'security_email' => 'pear-group@php.net',
 		'db' => 'pear',
+    'db_driver' => 'mysqli',
 		'db_user' => 'nobody',
 		'db_pass' => '',
 		'db_host' => 'localhost',
-		'patch_tmp' => '/tmp/patches/', 
+		'patch_tmp' => '/tmp/patches/',
 	),
 	'pecl' => array (
 		'url' => 'pecl.php.net',
@@ -57,13 +64,19 @@
 		'email' => 'pecl-bugs@lists.php.net',
 		'security_email' => 'security@php.net',
 		'db' => 'pear',
+    'db_driver' => 'mysqli',
 		'db_user' => 'nobody',
 		'db_pass' => '',
 		'db_host' => 'localhost',
-		'patch_tmp' => '/tmp/patches/', 
+		'patch_tmp' => '/tmp/patches/',
 	),
 );
 
+// load config
+if (is_file(dirname(__FILE__).'/config_local.php')) {
+  require_once(dirname(__FILE__).'/config_local.php');
+}
+
 define('DEVBOX', true);
 
 if (!defined('PEAR_CHANNELNAME'))
@@ -81,7 +94,7 @@
 $main_include_path = realpath(dirname(__FILE__).'/../');
 $templates_path = realpath(dirname(__FILE__).'/../../');
 define('BUG_PATCHTRACKER_TMPDIR', $site_data[$site]['patch_tmp']);
-define('PEAR_DATABASE_DSN', "mysqli://{$site_data[$site]['db_user']}:{$site_data[$site]['db_pass']}@{$site_data[$site]['db_host']}/{$site_data[$site]['db']}");
+define('PEAR_DATABASE_DSN', "{$site_data[$site]['db_driver']}://{$site_data[$site]['db_user']}:{$site_data[$site]['db_pass']}@{$site_data[$site]['db_host']}/{$site_data[$site]['db']}");
 
 // Last Updated..
 $tmp = filectime($_SERVER['SCRIPT_FILENAME']);