aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNathan Guse <nathaniel.guse@gmail.com>2014-02-18 12:26:49 -0600
committerNathan Guse <nathaniel.guse@gmail.com>2014-02-18 12:26:49 -0600
commit5fc29e0d2bf350db5587fdbc87ef819360f1d78e (patch)
tree0742c4854e75142d6d85d23ab36b5e02db7670c1
parent233bdfa5f639e44a8315736bc917fb8322bd0e15 (diff)
parent8a96e0bc52a1f81ab6b03223cbb36710c4f77254 (diff)
downloadforums-5fc29e0d2bf350db5587fdbc87ef819360f1d78e.tar
forums-5fc29e0d2bf350db5587fdbc87ef819360f1d78e.tar.gz
forums-5fc29e0d2bf350db5587fdbc87ef819360f1d78e.tar.bz2
forums-5fc29e0d2bf350db5587fdbc87ef819360f1d78e.tar.xz
forums-5fc29e0d2bf350db5587fdbc87ef819360f1d78e.zip
Merge pull request #2008 from marc1706/ticket/12167
[ticket/12167] Allow users to change style via style parameter by default
-rw-r--r--phpBB/phpbb/user.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/phpbb/user.php b/phpBB/phpbb/user.php
index b2ab187a70..2a7cc602da 100644
--- a/phpBB/phpbb/user.php
+++ b/phpBB/phpbb/user.php
@@ -183,7 +183,7 @@ class user extends \phpbb\session
unset($lang_set_ext);
$style_request = request_var('style', 0);
- if ($style_request && $auth->acl_get('a_styles') && !defined('ADMIN_START'))
+ if ($style_request && (!$config['override_user_style'] || $auth->acl_get('a_styles')) && !defined('ADMIN_START'))
{
global $SID, $_EXTRA_URL;