diff options
author | Marc Alexander <admin@m-a-styles.de> | 2019-10-13 12:29:34 +0200 |
---|---|---|
committer | Marc Alexander <admin@m-a-styles.de> | 2019-10-13 12:29:34 +0200 |
commit | 8c2d0c8c3639bbfc2799d372cc7aafcb62fc4b8a (patch) | |
tree | 14dfe3014300268e2f775f86075fd89d5552a004 /phpBB/includes/acp | |
parent | 6f48b3c044a5339bc019f355db490e1a53b51fdc (diff) | |
parent | e8b4304c1bbe35784b4cac5dd4059d6a4ac2dcac (diff) | |
download | forums-8c2d0c8c3639bbfc2799d372cc7aafcb62fc4b8a.tar forums-8c2d0c8c3639bbfc2799d372cc7aafcb62fc4b8a.tar.gz forums-8c2d0c8c3639bbfc2799d372cc7aafcb62fc4b8a.tar.bz2 forums-8c2d0c8c3639bbfc2799d372cc7aafcb62fc4b8a.tar.xz forums-8c2d0c8c3639bbfc2799d372cc7aafcb62fc4b8a.zip |
Merge pull request #5708 from marc1706/ticket/16051
[ticket/16051] Remove mysql driver as it's no longer supported in PHP >= 7.0
Diffstat (limited to 'phpBB/includes/acp')
-rw-r--r-- | phpBB/includes/acp/acp_database.php | 2 | ||||
-rw-r--r-- | phpBB/includes/acp/acp_forums.php | 1 | ||||
-rw-r--r-- | phpBB/includes/acp/acp_reasons.php | 2 |
3 files changed, 0 insertions, 5 deletions
diff --git a/phpBB/includes/acp/acp_database.php b/phpBB/includes/acp/acp_database.php index 677fce7217..c1c748832b 100644 --- a/phpBB/includes/acp/acp_database.php +++ b/phpBB/includes/acp/acp_database.php @@ -248,8 +248,6 @@ class acp_database switch ($db->get_sql_layer()) { - case 'mysql': - case 'mysql4': case 'mysqli': case 'sqlite3': while (($sql = $fgetd($fp, ";\n", $read, $seek, $eof)) !== false) diff --git a/phpBB/includes/acp/acp_forums.php b/phpBB/includes/acp/acp_forums.php index cb0593b14a..9044cd0e97 100644 --- a/phpBB/includes/acp/acp_forums.php +++ b/phpBB/includes/acp/acp_forums.php @@ -1878,7 +1878,6 @@ class acp_forums switch ($db->get_sql_layer()) { - case 'mysql4': case 'mysqli': // Delete everything else and thank MySQL for offering multi-table deletion diff --git a/phpBB/includes/acp/acp_reasons.php b/phpBB/includes/acp/acp_reasons.php index dfb2ccbfd3..f3f82bdfca 100644 --- a/phpBB/includes/acp/acp_reasons.php +++ b/phpBB/includes/acp/acp_reasons.php @@ -222,8 +222,6 @@ class acp_reasons { // The ugly one! case 'mysqli': - case 'mysql4': - case 'mysql': // Change the reports using this reason to 'other' $sql = 'UPDATE ' . REPORTS_TABLE . ' SET reason_id = ' . $other_reason_id . ", report_text = CONCAT('" . $db->sql_escape($reason_row['reason_description']) . "\n\n', report_text) |