mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-08 16:45:19 +02:00
Code Issues Releases Wiki Activity

mysqli error + email hash

Browse Source 
git-svn-id: file:///svn/phpbb/trunk@6109 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Graham Eames 2006-06-20 20:46:01 +00:00
parent 0cc3aff18d
commit 73c7f34176
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
phpBB/install/install_install.php
View File

@ -952,12 +952,18 @@ class install_install extends module
{ {
case 'mysql': case 'mysql':
case 'mysql4': case 'mysql4':
case 'mysqli':
// We don't want MySQL mixing up collations // We don't want MySQL mixing up collations
if (version_compare(mysql_get_server_info(), '4.1.2', '>=')) if (version_compare(mysql_get_server_info(), '4.1.2', '>='))
{ {
$sql_query = preg_replace('/^\);$/m', ') DEFAULT CHARACTER SET latin1;', $sql_query); $sql_query = preg_replace('/^\);$/m', ') DEFAULT CHARACTER SET latin1;', $sql_query);
} }
break;
case 'mysqli':
// mysqli only works with MySQL > 4.1.3 so we'll just do a straight replace if using this DBMS
$sql_query = preg_replace('/^\);$/m', ') DEFAULT CHARACTER SET latin1;', $sql_query);
break; break;
} }
@ -1102,7 +1108,7 @@ class install_install extends module
WHERE config_name = 'newest_username'", WHERE config_name = 'newest_username'",
'UPDATE ' . $table_prefix . "users 'UPDATE ' . $table_prefix . "users
SET username = '" . $db->sql_escape($admin_name) . "', user_password='" . $db->sql_escape(md5($admin_pass1)) . "', user_lang = '" . $db->sql_escape($language) . "', user_email='" . $db->sql_escape($board_email1) . "', user_dateformat='" . $db->sql_escape($lang['default_dateformat']) . "' SET username = '" . $db->sql_escape($admin_name) . "', user_password='" . $db->sql_escape(md5($admin_pass1)) . "', user_lang = '" . $db->sql_escape($language) . "', user_email='" . $db->sql_escape($board_email1) . "', user_dateformat='" . $db->sql_escape($lang['default_dateformat']) . "', user_email_hash = '" . (int) (crc32(strtolower($board_email1)) . strlen($board_email1)) . "'
WHERE username = 'Admin'", WHERE username = 'Admin'",
'UPDATE ' . $table_prefix . "moderator_cache 'UPDATE ' . $table_prefix . "moderator_cache