Merge branch 'master' into testing

This commit is contained in:
Brion Vibber
2010-06-14 10:53:22 -07:00
3 changed files with 261 additions and 1 deletions

View File

@@ -446,7 +446,7 @@ abstract class Installer
case 'mysqli':
$res = $conn->query($stmt);
if ($res === false) {
$error = $conn->error();
$error = $conn->error;
}
break;
case 'pgsql':