Просмотр исходного кода

fix upgrade.php for mysqli thanks emanuele for help

Signed-off-by: illori [email protected]
Illori 11 лет назад
Родитель
Сommit
ef707ed60d
1 измененных файлов с 3 добавлено и 3 удалено
  1. 3 3
      other/upgrade.php

+ 3 - 3
other/upgrade.php

@@ -22,10 +22,10 @@ $databases = array(
 	'mysqli' => array(
 		'name' => 'MySQLi',
 		'version' => '4.0.18',
-		'version_check' => 'return min(mysqli_get_server_info($db_connection), mysqli_get_client_info());',
+		'version_check' => 'global $db_connection; return min(mysqli_get_server_info($db_connection), mysqli_get_client_info());',
 		'utf8_support' => true,
 		'utf8_version' => '4.1.0',
-		'utf8_version_check' => 'return mysqli_get_server_info($db_connection);',
+		'utf8_version_check' => 'global $db_connection; return mysqli_get_server_info($db_connection);',
 		'alter_support' => true,
 	),
 	'mysql' => array(
@@ -3843,7 +3843,7 @@ function template_welcome_message()
 	echo '
 			</table><br />
 			<span class="smalltext">
-				<strong>Note:</strong> If necessary the above security check can be bypassed for users who may administrate a server but not have admin rights on the forum. In order to bypass the above check simply open &quot;upgrade.php&quot; in a text editor and replace &quot;$disable_security = 0;&quot; with &quot;$disable_security = 1;&quot; and refresh this page.
+				<strong>Note:</strong> If necessary the above security check can be bypassed for users who may administrate a server but not have admin rights on the forum. In order to bypass the above check simply open &quot;upgrade.php&quot; in a text editor and replace &quot;$disable_security = false;&quot; with &quot;$disable_security = true;&quot; and refresh this page.
 			</span>
 			<input type="hidden" name="login_attempt" id="login_attempt" value="1" />
 			<input type="hidden" name="js_works" id="js_works" value="0" />';