Quote "admin" column name for MySQL (#4588)

mybb · Sep 25, 2022 · 0bf8fdb · 0bf8fdb
1 parent 567f277
commit 0bf8fdb
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/admin/modules/user/users.php b/admin/modules/user/users.php
@@ -2005,7 +2005,17 @@ function toggleBox(action)
 			merge_thread_ratings($source_user['uid'], $destination_user['uid']);
 
 			// Banning
-			$db->update_query("banned", array('admin' => $destination_user['uid']), "admin = '{$source_user['uid']}'");
+			switch($db->type)
+			{
+				case 'mysql':
+				case 'mysqli':
+					$where = "`admin` = '{$source_user['uid']}'";
+					break;
+				default:
+					$where = "admin = '{$source_user['uid']}'";
+					break;
+			}
+			$db->update_query("banned", array('admin' => $destination_user['uid']), $where);
 
 			// Carry over referrals
 			$db->update_query("users", array("referrer" => $destination_user['uid']), "referrer='{$source_user['uid']}' AND uid!='{$destination_user['uid']}'");

diff --git a/install/resources/mysql_db_tables.php b/install/resources/mysql_db_tables.php
@@ -145,7 +145,7 @@
   oldgroup int unsigned NOT NULL default '0',
   oldadditionalgroups text NOT NULL,
   olddisplaygroup int unsigned NOT NULL default '0',
-  admin int unsigned NOT NULL default '0',
+  `admin` int unsigned NOT NULL default '0',
   dateline int unsigned NOT NULL default '0',
   bantime varchar(50) NOT NULL default '',
   lifted int unsigned NOT NULL default '0',