Merge with 0306834dd0f363fd0c897b5229525e1f341d9f83

16 years ago · 1dbc6b2505
parent 0dba37654b b22d7a10d8
commit 1dbc6b2505
1 changed files with 1 additions and 1 deletions
--- a/main/inc/lib/database.lib.php
+++ b/main/inc/lib/database.lib.php
@ -1278,7 +1278,7 @@ class Database {
 			return null;
 		}
 		if (empty($language)) {
-			$result = self::fetch_array(self::query("SHOW COLLATION WHERE Charset = '".self::escape_string($db_encoding)."' AND Default = 'Yes';"), 'NUM');
+			$result = self::fetch_array(self::query("SHOW COLLATION WHERE Charset = '".self::escape_string($db_encoding)."' AND  `Default` = 'Yes';"), 'NUM');
 			return $result ? $result[0] : null;
 		}
 		$collation = $db_encoding.'_'.$language.'_ci';