diff options
| author | Henry Sudhof <kellanved@phpbb.com> | 2007-10-12 16:11:41 +0000 |
|---|---|---|
| committer | Henry Sudhof <kellanved@phpbb.com> | 2007-10-12 16:11:41 +0000 |
| commit | e365b6abfa5668a986e58ebf50d4d9b4e847cb72 (patch) | |
| tree | 15fcc7a6f20f5a9c3432fbcf1a5250b7c57bd69f | |
| parent | a1727d94019b58dfeadfcbd804a559be78865220 (diff) | |
| download | forums-e365b6abfa5668a986e58ebf50d4d9b4e847cb72.tar forums-e365b6abfa5668a986e58ebf50d4d9b4e847cb72.tar.gz forums-e365b6abfa5668a986e58ebf50d4d9b4e847cb72.tar.bz2 forums-e365b6abfa5668a986e58ebf50d4d9b4e847cb72.tar.xz forums-e365b6abfa5668a986e58ebf50d4d9b4e847cb72.zip | |
#14704
That should solve the issue for the user table, I hope that it doesn't manifest at other places.
git-svn-id: file:///svn/phpbb/trunk@8167 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/install/convertors/convert_phpbb20.php | 20 | ||||
| -rwxr-xr-x | phpBB/install/install_install.php | 2 |
2 files changed, 11 insertions, 11 deletions
diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php index 9a0e400d94..9992b94aa7 100644 --- a/phpBB/install/convertors/convert_phpbb20.php +++ b/phpBB/install/convertors/convert_phpbb20.php @@ -853,15 +853,15 @@ if (!$get_info) array('username_clean', 'users.username', array('function1' => 'phpbb_set_default_encoding', 'function2' => 'utf8_clean_string')), array('user_password', 'users.user_password', ''), array('user_pass_convert', 1, ''), - array('user_posts', 'users.user_posts', ''), + array('user_posts', 'users.user_posts', 'intval'), array('user_email', 'users.user_email', 'strtolower'), array('user_email_hash', 'users.user_email', 'gen_email_hash'), array('user_birthday', ((defined('MOD_BIRTHDAY')) ? 'users.user_birthday' : ''), 'phpbb_get_birthday'), - array('user_lastvisit', 'users.user_lastvisit', ''), - array('user_lastmark', 'users.user_lastvisit', ''), + array('user_lastvisit', 'users.user_lastvisit', 'intval'), + array('user_lastmark', 'users.user_lastvisit', 'intval'), array('user_lang', $config['default_lang'], ''), array('', 'users.user_lang', ''), - array('user_timezone', 'users.user_timezone', ''), + array('user_timezone', 'users.user_timezone', 'floatval'), array('user_dateformat', 'users.user_dateformat', array('function1' => 'phpbb_set_encoding', 'function2' => 'fill_dateformat')), array('user_inactive_reason', '', 'phpbb_inactive_reason'), array('user_inactive_time', '', 'phpbb_inactive_time'), @@ -875,7 +875,7 @@ if (!$get_info) array('user_aim', 'users.user_aim', array('function1' => 'phpbb_set_encoding')), array('user_icq', 'users.user_icq', array('function1' => 'phpbb_set_encoding')), array('user_from', 'users.user_from', array('function1' => 'phpbb_set_encoding')), - array('user_rank', 'users.user_rank', ''), + array('user_rank', 'users.user_rank', 'intval'), array('user_permissions', '', ''), array('user_avatar', 'users.user_avatar', 'phpbb_import_avatar'), @@ -885,13 +885,13 @@ if (!$get_info) array('user_new_privmsg', 'users.user_new_privmsg', ''), array('user_unread_privmsg', 0, ''), //'users.user_unread_privmsg' - array('user_last_privmsg', 'users.user_last_privmsg', ''), + array('user_last_privmsg', 'users.user_last_privmsg', 'intval'), array('user_emailtime', 'users.user_emailtime', 'null_to_zero'), - array('user_notify', 'users.user_notify', ''), - array('user_notify_pm', 'users.user_notify_pm', ''), + array('user_notify', 'users.user_notify', 'intval'), + array('user_notify_pm', 'users.user_notify_pm', 'intval'), array('user_notify_type', NOTIFY_EMAIL, ''), - array('user_allow_pm', 'users.user_allow_pm', ''), - array('user_allow_viewonline', 'users.user_allow_viewonline', ''), + array('user_allow_pm', 'users.user_allow_pm', 'intval'), + array('user_allow_viewonline', 'users.user_allow_viewonline', 'intval'), array('user_allow_viewemail', 'users.user_viewemail', 'intval'), array('user_actkey', 'users.user_actkey', ''), array('user_newpasswd', '', ''), // Users need to re-request their password... diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php index 7bc0f32be3..ca86816e9c 100755 --- a/phpBB/install/install_install.php +++ b/phpBB/install/install_install.php @@ -1309,7 +1309,7 @@ class install_install extends module WHERE config_name = 'avatar_salt'", 'UPDATE ' . $data['table_prefix'] . "users - SET username = '" . $db->sql_escape($data['admin_name']) . "', user_password='" . $db->sql_escape(phpbb_hash($data['admin_pass1'])) . "', user_ip = '" . $db->sql_escape($user_ip) . "', user_lang = '" . $db->sql_escape($data['default_lang']) . "', user_email='" . $db->sql_escape($data['board_email1']) . "', user_dateformat='" . $db->sql_escape($lang['default_dateformat']) . "', user_email_hash = " . (crc32($data['board_email1']) . strlen($data['board_email1'])) . ", username_clean = '" . $db->sql_escape(utf8_clean_string($data['admin_name'])) . "' + SET username = '" . $db->sql_escape($data['admin_name']) . "', user_password='" . $db->sql_escape(md5($data['admin_pass1'])) . "', user_ip = '" . $db->sql_escape($user_ip) . "', user_lang = '" . $db->sql_escape($data['default_lang']) . "', user_email='" . $db->sql_escape($data['board_email1']) . "', user_dateformat='" . $db->sql_escape($lang['default_dateformat']) . "', user_email_hash = " . (crc32($data['board_email1']) . strlen($data['board_email1'])) . ", username_clean = '" . $db->sql_escape(utf8_clean_string($data['admin_name'])) . "' WHERE username = 'Admin'", 'UPDATE ' . $data['table_prefix'] . "moderator_cache |