public/tt-rss
1
0
Fork 0
mirror of https://git.tt-rss.org/git/tt-rss.git synced 2025-12-13 17:45:55 +00:00
Code Issues Releases Wiki Activity

remove support for legacy mysql driver

Browse Source
This commit is contained in:
Andrew Dolgov
2016-08-21 14:03:35 +03:00
parent a005ebb693
commit e54eb40a8c
4 changed files with 10 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
install/index.php
View File

@@ -51,7 +51,7 @@
array_push($errors, "PHP support for JSON is required, but was not found.");
}
if ($db_type == "mysql" && !function_exists("mysql_connect") && !function_exists("mysqli_connect")) {
if ($db_type == "mysql" && !function_exists("mysqli_connect")) {
array_push($errors, "PHP support for MySQL is required for configured $db_type in config.php.");
}
@@ -112,19 +112,10 @@
return $link;
} else if ($type == "mysql") {
if (function_exists("mysqli_connect")) {
if ($port)
return mysqli_connect($host, $user, $pass, $db, $port);
else
return mysqli_connect($host, $user, $pass, $db);
} else {
$link = mysql_connect($host, $user, $pass);
if ($link) {
$result = mysql_select_db($db, $link);
if ($result) return $link;
}
}
if ($port)
return mysqli_connect($host, $user, $pass, $db, $port);
else
return mysqli_connect($host, $user, $pass, $db);
}
}
@@ -184,15 +175,12 @@
return $result;
} else if ($type == "mysql") {
if (function_exists("mysqli_connect")) {
$result = mysqli_query($link, $query);
} else {
$result = mysql_query($query, $link);
}
$result = mysqli_query($link, $query);
if (!$result) {
$query = htmlspecialchars($query);
if ($die_on_error) {
die("Query <i>$query</i> failed: " . ($link ? function_exists("mysqli_connect") ? mysqli_error($link) : mysql_error($link) : "No connection"));
die("Query <i>$query</i> failed: " . ($link ? mysqli_error($link) : "No connection"));
}
}
return $result;