diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2012-04-08 22:04:33 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2012-04-08 22:04:33 +0200 |
| commit | 26e7dd98b71655c7e09be02ebd3ef84765ce27b8 (patch) | |
| tree | 8d77283a8f8127c2a3adeddb2ca6fde3fc0305a2 /phpBB/includes/ucp/ucp_prefs.php | |
| parent | ce4eb62b14f290efce997d6a73f0a6425fff2901 (diff) | |
| parent | 156ae40d6fae2067a65a2125924e39e8dc5f35e1 (diff) | |
| download | forums-26e7dd98b71655c7e09be02ebd3ef84765ce27b8.tar forums-26e7dd98b71655c7e09be02ebd3ef84765ce27b8.tar.gz forums-26e7dd98b71655c7e09be02ebd3ef84765ce27b8.tar.bz2 forums-26e7dd98b71655c7e09be02ebd3ef84765ce27b8.tar.xz forums-26e7dd98b71655c7e09be02ebd3ef84765ce27b8.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/10561] Removed extra tabs, changes made to $db->sql_query()
[ticket/10561] Changed $temp_style_id to $style_id
[ticket/10561] Added function desc for phpbb_style_is_active()
[ticket/10561] Casted $config['default_style'] to int
[ticket/10561] Reverted to phpbb_style_is_active()
[ticket/10561] Added to database_update:database_update_info()
[ticket/10561] Added section in database_update.php
[ticket/10561] Moved and renamed the funtion validate_style().
[ticket/10561] Fixed syntax error and renamed return variables.
[ticket/10561] Changes made to $db->sql_fetchrow().
[ticket/10561] Changes made to function phpbb_style_is_active().
[ticket/10561] All users can choose deactivated styles (fixed).
Conflicts:
phpBB/install/database_update.php
Diffstat (limited to 'phpBB/includes/ucp/ucp_prefs.php')
| -rw-r--r-- | phpBB/includes/ucp/ucp_prefs.php | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/phpBB/includes/ucp/ucp_prefs.php b/phpBB/includes/ucp/ucp_prefs.php index 11f2d231fe..0c9f20f266 100644 --- a/phpBB/includes/ucp/ucp_prefs.php +++ b/phpBB/includes/ucp/ucp_prefs.php @@ -60,7 +60,14 @@ class ucp_prefs if ($submit) { - $data['style'] = ($config['override_user_style']) ? $config['default_style'] : $data['style']; + if ($config['override_user_style']) + { + $data['style'] = (int) $config['default_style']; + } + else if (!phpbb_style_is_active($data['style'])) + { + $data['style'] = (int) $user->data['user_style']; + } $error = validate_data($data, array( 'dateformat' => array('string', false, 1, 30), |