diff options
| author | justauser <[email protected]> | 2013-05-29 07:52:20 -0400 |
|---|---|---|
| committer | justauser <[email protected]> | 2013-05-29 07:52:20 -0400 |
| commit | 7aab5617b689701cd9b6210132ed4e9dd55d3941 (patch) | |
| tree | 7c8d51231f0c0bc9207e048437a50546c961c60d /install | |
| parent | 991418fa566ff462d9616123168c5f7f839cdc15 (diff) | |
| parent | 67e0cf9a371fca46405e7df26ccc970ce6b408cc (diff) | |
Merge branch 'master' into jremote
latest master checkins
Diffstat (limited to 'install')
| -rw-r--r-- | install/index.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/install/index.php b/install/index.php index efa917d95..06f13fe14 100644 --- a/install/index.php +++ b/install/index.php @@ -191,7 +191,7 @@ if (!$result) { $query = htmlspecialchars($query); if ($die_on_error) { - die("Query <i>$query</i> failed: " . ($link ? mysql_error($link) : "No connection")); + die("Query <i>$query</i> failed: " . ($link ? function_exists("mysqli_connect") ? mysqli_error($link) : mysql_error($link) : "No connection")); } } return $result; |