From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Tue, 28 May 2013 20:32:23 +0000 (+0400)
Subject: installer: use mysqli_error when using mysqli (closes #696)
X-Git-Tag: 1.8~56
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=4e46e90ef7cca9ab5b9f2ddcc260f1423265dbab;p=tt-rss.git

installer: use mysqli_error when using mysqli (closes #696)
---

diff --git a/install/index.php b/install/index.php
index efa917d9..06f13fe1 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;