diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2009-07-24 08:52:56 +0000 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2009-07-24 08:52:56 +0000 |
| commit | f84cbee47c06dd9df3b2cf7085a3b37ab9095d09 (patch) | |
| tree | 8a2d6e56d5122c1a3b34f50fef0acf40c90891bf /phpBB | |
| parent | 224aa404f6c8f0014a0dc48b9776ff431b8d4f48 (diff) | |
| download | forums-f84cbee47c06dd9df3b2cf7085a3b37ab9095d09.tar forums-f84cbee47c06dd9df3b2cf7085a3b37ab9095d09.tar.gz forums-f84cbee47c06dd9df3b2cf7085a3b37ab9095d09.tar.bz2 forums-f84cbee47c06dd9df3b2cf7085a3b37ab9095d09.tar.xz forums-f84cbee47c06dd9df3b2cf7085a3b37ab9095d09.zip | |
Fix bug #18005 - Do not add style-parameter to URL again, after admin re-authentification - Patch by leviatan21
Authorised by: AcydBurn
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9841 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 1 | ||||
| -rw-r--r-- | phpBB/includes/session.php | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index b8d233ca13..f235be1e9b 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -172,6 +172,7 @@ <li>[Fix] Be less strict with FTP daemons when getting directory filelists. (Bug #46295)</li> <li>[Fix] Fix set_custom_template for database-stored styles (Bug #40515 - Patch by nickvergessen)</li> <li>[Fix] Banning an already banned user states to be successful, but has no effect (Bug #47825 - Patch by Pyramide)</li> + <li>[Fix] Do not add style-parameter to URL again, after admin re-authentification (Bug #18005 - Patch by leviatan21)</li> <li>[Change] Change the data format of the default file ACM to be more secure from tampering and have better performance.</li> <li>[Change] Add index on log_time to the log table to prevent slowdown on boards with many log entries. (Bug #44665 - Patch by bantu)</li> <li>[Change] Template engine now permits to a limited extent variable includes.</li> diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php index 9ae5a7c793..c8617057c4 100644 --- a/phpBB/includes/session.php +++ b/phpBB/includes/session.php @@ -1534,7 +1534,7 @@ class user extends session $this->add_lang($lang_set); unset($lang_set); - if (!empty($_GET['style']) && $auth->acl_get('a_styles')) + if (!empty($_GET['style']) && $auth->acl_get('a_styles') && !defined('ADMIN_START')) { global $SID, $_EXTRA_URL; |