diff options
| author | Brion Vibber <brion@pobox.com> | 2010-06-16 12:38:35 -0700 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-06-16 12:38:35 -0700 |
| commit | 9684cbe3c6d61be0b1cc2094bc4278cd8a21b33e (patch) | |
| tree | 46a52783103529ccd52b4a5af5347df35cf9f894 /lib/installer.php | |
| parent | 7f3b3620af2af88ced37da1d9f8913cfd1a31b90 (diff) | |
| parent | d65d9826811c5e9b2aec01aa89abffbfbee535f8 (diff) | |
Merge branch 'testing' into 0.9.x
Conflicts:
plugins/OpenID/openidserver.php
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': |