From e54eb40a8c1ec9fe9387611d890d195f511a4180 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Sun, 21 Aug 2016 14:03:35 +0300
Subject: remove support for legacy mysql driver

---
 install/index.php | 28 ++++++++--------------------
 1 file changed, 8 insertions(+), 20 deletions(-)

(limited to 'install')

diff --git a/install/index.php b/install/index.php
index bfbb7e234..00e90dfe7 100755
--- a/install/index.php
+++ b/install/index.php
@@ -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;
-- 
cgit v1.2.3