diff options
| author | Brion Vibber <brion@pobox.com> | 2010-06-26 10:18:03 -0400 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-06-26 10:18:03 -0400 |
| commit | 00e129b01343e37dbd662b95f423e731b0867023 (patch) | |
| tree | ba7e1bb3706adb6081bb61fd9499bef38213be8e /lib/installer.php | |
| parent | dad0b06a386092b159118780a6a6801f3cf674de (diff) | |
| parent | 696e4ba393c658d5b2e1fe46e1389bd7b2cfdb34 (diff) | |
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x
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 56b9b6f4a..bd9d69cd4 100644 --- a/lib/installer.php +++ b/lib/installer.php @@ -447,7 +447,7 @@ abstract class Installer case 'mysqli': $res = $conn->query($stmt); if ($res === false) { - $error = $conn->error(); + $error = $conn->error; } break; case 'pgsql': |