aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2019-11-21 14:55:37 +0100
committerMarc Alexander <admin@m-a-styles.de>2019-11-21 14:55:37 +0100
commitb6ec8c8a9497c05bafc06f3d86ecdf7c36960ac3 (patch)
tree250d45463cf490b0d181ca7ed60ca55f75f12d36 /phpBB/install
parentMerge branch '3.3.x' (diff)
parentMerge pull request #5727 from marc1706/ticket/16167 (diff)
downloadphpbb-b6ec8c8a9497c05bafc06f3d86ecdf7c36960ac3.tar.gz
phpbb-b6ec8c8a9497c05bafc06f3d86ecdf7c36960ac3.tar.bz2
phpbb-b6ec8c8a9497c05bafc06f3d86ecdf7c36960ac3.zip
Merge branch '3.3.x'
Diffstat (limited to 'phpBB/install')
-rw-r--r--phpBB/install/convertors/convert_phpbb20.php1
1 files changed, 0 insertions, 1 deletions
diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php
index 7698558f1a..d58ee6095a 100644
--- a/phpBB/install/convertors/convert_phpbb20.php
+++ b/phpBB/install/convertors/convert_phpbb20.php
@@ -898,7 +898,6 @@ if (!$get_info)
array('user_password', 'users.user_password', 'phpbb_convert_password_hash'),
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', 'intval'),
array('user_lastmark', 'users.user_lastvisit', 'intval'),