diff options
| author | Graham Eames <grahamje@users.sourceforge.net> | 2006-06-20 20:46:01 +0000 |
|---|---|---|
| committer | Graham Eames <grahamje@users.sourceforge.net> | 2006-06-20 20:46:01 +0000 |
| commit | 73c7f34176c94bb13bd079d02fc07320cd4cfabe (patch) | |
| tree | 96050de40c83c8b24d38eea2e38fb9e845a0b0e3 | |
| parent | 0cc3aff18d32d2a4c2cf68869712f831b4b9c34a (diff) | |
| download | forums-73c7f34176c94bb13bd079d02fc07320cd4cfabe.tar forums-73c7f34176c94bb13bd079d02fc07320cd4cfabe.tar.gz forums-73c7f34176c94bb13bd079d02fc07320cd4cfabe.tar.bz2 forums-73c7f34176c94bb13bd079d02fc07320cd4cfabe.tar.xz forums-73c7f34176c94bb13bd079d02fc07320cd4cfabe.zip | |
mysqli error + email hash
git-svn-id: file:///svn/phpbb/trunk@6109 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rwxr-xr-x | phpBB/install/install_install.php | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php index 8b0d86db7e..6530876ee4 100755 --- a/phpBB/install/install_install.php +++ b/phpBB/install/install_install.php @@ -952,12 +952,18 @@ class install_install extends module { case 'mysql': case 'mysql4': - case 'mysqli': // We don't want MySQL mixing up collations if (version_compare(mysql_get_server_info(), '4.1.2', '>=')) { $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; } @@ -1102,7 +1108,7 @@ class install_install extends module WHERE config_name = 'newest_username'", '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'", 'UPDATE ' . $table_prefix . "moderator_cache |