diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2013-10-29 00:00:00 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2013-10-29 00:00:00 +0100 |
| commit | 59e3c2d16e5fa3eb6f1a872657454b437b72ae63 (patch) | |
| tree | 4b73ff239faac9125c1998eba0de8d8e607041d4 /phpBB/phpbb/user.php | |
| parent | ed94e3c5761cc188fc6e1e7943a888d30bd0e7b9 (diff) | |
| parent | 7f58a4572eaca75aecff2da889e67ea151616011 (diff) | |
| download | forums-59e3c2d16e5fa3eb6f1a872657454b437b72ae63.tar forums-59e3c2d16e5fa3eb6f1a872657454b437b72ae63.tar.gz forums-59e3c2d16e5fa3eb6f1a872657454b437b72ae63.tar.bz2 forums-59e3c2d16e5fa3eb6f1a872657454b437b72ae63.tar.xz forums-59e3c2d16e5fa3eb6f1a872657454b437b72ae63.zip | |
Merge remote-tracking branch 'marc1706/ticket/11981' into develop
* marc1706/ticket/11981:
[ticket/11981] Fix code sniffer complaints
Diffstat (limited to 'phpBB/phpbb/user.php')
| -rw-r--r-- | phpBB/phpbb/user.php | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/phpBB/phpbb/user.php b/phpBB/phpbb/user.php index f97cc94d40..d82acbf501 100644 --- a/phpBB/phpbb/user.php +++ b/phpBB/phpbb/user.php @@ -343,7 +343,6 @@ class user extends \phpbb\session } } - // Does the user need to change their password? If so, redirect to the // ucp profile reg_details page ... of course do not redirect if we're already in the ucp if (!defined('IN_ADMIN') && !defined('ADMIN_START') && $config['chg_passforce'] && !empty($this->data['is_registered']) && $auth->acl_get('u_chgpasswd') && $this->data['user_passchg'] < time() - ($config['chg_passforce'] * 86400)) |