From dcdd47cb757d1a359c663d6f0c297f9336b58ffc Mon Sep 17 00:00:00 2001 From: Graham Eames Date: Wed, 4 Oct 2006 20:51:51 +0000 Subject: Do not show styles select if overriding style git-svn-id: file:///svn/phpbb/trunk@6441 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/includes/ucp/ucp_prefs.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'phpBB/includes/ucp/ucp_prefs.php') diff --git a/phpBB/includes/ucp/ucp_prefs.php b/phpBB/includes/ucp/ucp_prefs.php index 60ed5dc360..5dce0b80c2 100644 --- a/phpBB/includes/ucp/ucp_prefs.php +++ b/phpBB/includes/ucp/ucp_prefs.php @@ -59,6 +59,8 @@ class ucp_prefs $data[$var] = request_var($var, $default); } + $data['style'] = ($config['override_user_style']) ? $config['default_style'] : $data['style']; + $var_ary = array( 'dateformat' => array('string', false, 3, 30), 'lang' => array('match', false, '#^[a-z0-9_\-]{2,}$#i'), @@ -141,7 +143,7 @@ class ucp_prefs 'A_DEFAULT_DATEFORMAT' => addslashes($config['default_dateformat']), 'S_LANG_OPTIONS' => language_select($data['lang']), - 'S_STYLE_OPTIONS' => style_select($data['style']), + 'S_STYLE_OPTIONS' => ($config['override_user_style']) ? '' : style_select($data['style']), 'S_TZ_OPTIONS' => tz_select($data['tz']), 'S_CAN_HIDE_ONLINE' => ($auth->acl_get('u_hideonline')) ? true : false, 'S_SELECT_NOTIFY' => ($config['jab_enable'] && $user->data['user_jabber'] && @extension_loaded('xml')) ? true : false) -- cgit v1.2.1