diff options
| author | Brion Vibber <brion@pobox.com> | 2010-06-14 10:53:22 -0700 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-06-14 10:53:22 -0700 |
| commit | a1b25b46bc4bf3dbe7766e865e0a47056786bf0c (patch) | |
| tree | dc8e7e5a2adfaaab73cc261c2d6cc3b737aadfdd /lib/installer.php | |
| parent | 47665e845ae74e6ee5b9a39565fb45dd9a93f921 (diff) | |
| parent | bfbebe597792d8bb49c0f04ccbd665ba1e1db19b (diff) | |
Merge branch 'master' into testing
Diffstat (limited to 'lib/installer.php')
| -rw-r--r-- | lib/installer.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/installer.php b/lib/installer.php index 7936d5d5d..78461efb7 100644 --- a/lib/installer.php +++ b/lib/installer.php @@ -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': |