aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/install
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2019-11-21 14:54:32 +0100
committerMarc Alexander <admin@m-a-styles.de>2019-11-21 14:54:32 +0100
commit2a023c9e15ffd03f07770adf6e8372d3b4e23057 (patch)
tree242e90b696746171f94d31bbf7c24afcf0550a92 /phpBB/phpbb/install
parent289524938ca527816a902f1a2acb9cf385c2598d (diff)
parentc628cd7e151a09e25ca0d980620b5fa3fe36a763 (diff)
downloadforums-2a023c9e15ffd03f07770adf6e8372d3b4e23057.tar
forums-2a023c9e15ffd03f07770adf6e8372d3b4e23057.tar.gz
forums-2a023c9e15ffd03f07770adf6e8372d3b4e23057.tar.bz2
forums-2a023c9e15ffd03f07770adf6e8372d3b4e23057.tar.xz
forums-2a023c9e15ffd03f07770adf6e8372d3b4e23057.zip
Merge pull request #5727 from marc1706/ticket/16167
[ticket/16167] Use user_email column for checking duplicates
Diffstat (limited to 'phpBB/phpbb/install')
-rw-r--r--phpBB/phpbb/install/module/install_database/task/add_config_settings.php1
1 files changed, 0 insertions, 1 deletions
diff --git a/phpBB/phpbb/install/module/install_database/task/add_config_settings.php b/phpBB/phpbb/install/module/install_database/task/add_config_settings.php
index ba439609ff..91d7884aa4 100644
--- a/phpBB/phpbb/install/module/install_database/task/add_config_settings.php
+++ b/phpBB/phpbb/install/module/install_database/task/add_config_settings.php
@@ -245,7 +245,6 @@ class add_config_settings extends \phpbb\install\task_base
user_lang = '" . $this->db->sql_escape($this->install_config->get('user_language', 'en')) . "',
user_email='" . $this->db->sql_escape($this->install_config->get('board_email')) . "',
user_dateformat='" . $this->db->sql_escape($this->language->lang('default_dateformat')) . "',
- user_email_hash = " . $this->db->sql_escape(phpbb_email_hash($this->install_config->get('board_email'))) . ",
username_clean = '" . $this->db->sql_escape(utf8_clean_string($this->install_config->get('admin_name'))) . "'
WHERE username = 'Admin'",