makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 12:28:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2782 from marc1706/ticket/12895

Browse source 
[ticket/12895] Rename user style setting to resolve conflict with style param

* marc1706/ticket/12895:
  [ticket/12895] Rename user style setting to resolve conflict with style param
This commit is contained in:
Joas Schilling 2014-08-02 13:56:16 +02:00
commit c991b1d587
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
phpBB/includes/ucp/ucp_prefs.php
View file

@ -43,7 +43,7 @@ class ucp_prefs
'notifymethod' => request_var('notifymethod', $user->data['user_notify_type']), 'notifymethod' => request_var('notifymethod', $user->data['user_notify_type']),
'dateformat' => request_var('dateformat', $user->data['user_dateformat'], true), 'dateformat' => request_var('dateformat', $user->data['user_dateformat'], true),
'lang' => basename(request_var('lang', $user->data['user_lang'])), 'lang' => basename(request_var('lang', $user->data['user_lang'])),
'style' => request_var('style', (int) $user->data['user_style']), 'user_style' => request_var('user_style', (int) $user->data['user_style']),
'tz' => request_var('tz', $user->data['user_timezone']), 'tz' => request_var('tz', $user->data['user_timezone']),
'viewemail' => request_var('viewemail', (bool) $user->data['user_allow_viewemail']), 'viewemail' => request_var('viewemail', (bool) $user->data['user_allow_viewemail']),
@ -76,11 +76,11 @@ class ucp_prefs
{ {
if ($config['override_user_style']) if ($config['override_user_style'])
{ {
$data['style'] = (int) $config['default_style']; $data['user_style'] = (int) $config['default_style'];
} }
else if (!phpbb_style_is_active($data['style'])) else if (!phpbb_style_is_active($data['user_style']))
{ {
$data['style'] = (int) $user->data['user_style']; $data['user_style'] = (int) $user->data['user_style'];
} }
$error = validate_data($data, array( $error = validate_data($data, array(
@ -107,7 +107,7 @@ class ucp_prefs
'user_dateformat' => $data['dateformat'], 'user_dateformat' => $data['dateformat'],
'user_lang' => $data['lang'], 'user_lang' => $data['lang'],
'user_timezone' => $data['tz'], 'user_timezone' => $data['tz'],
'user_style' => $data['style'], 'user_style' => $data['user_style'],
); );
/** /**
@ -207,7 +207,7 @@ class ucp_prefs
'S_MORE_STYLES' => $s_more_styles, 'S_MORE_STYLES' => $s_more_styles,
'S_LANG_OPTIONS' => language_select($data['lang']), 'S_LANG_OPTIONS' => language_select($data['lang']),
'S_STYLE_OPTIONS' => ($config['override_user_style']) ? '' : style_select($data['style']), 'S_STYLE_OPTIONS' => ($config['override_user_style']) ? '' : style_select($data['user_style']),
'S_TZ_OPTIONS' => $timezone_selects['tz_select'], 'S_TZ_OPTIONS' => $timezone_selects['tz_select'],
'S_TZ_DATE_OPTIONS' => $timezone_selects['tz_dates'], 'S_TZ_DATE_OPTIONS' => $timezone_selects['tz_dates'],
'S_CAN_HIDE_ONLINE' => ($auth->acl_get('u_hideonline')) ? true : false, 'S_CAN_HIDE_ONLINE' => ($auth->acl_get('u_hideonline')) ? true : false,

4
phpBB/styles/prosilver/template/ucp_prefs_personal.html
View file

@ -58,8 +58,8 @@
<!-- ENDIF --> <!-- ENDIF -->
<!-- IF S_STYLE_OPTIONS and S_MORE_STYLES --> <!-- IF S_STYLE_OPTIONS and S_MORE_STYLES -->
<dl> <dl>
<dt><label for="style">{L_BOARD_STYLE}{L_COLON}</label></dt> <dt><label for="user_style">{L_BOARD_STYLE}{L_COLON}</label></dt>
<dd><select name="style" id="style">{S_STYLE_OPTIONS}</select></dd> <dd><select name="user_style" id="user_style">{S_STYLE_OPTIONS}</select></dd>
</dl> </dl>
<!-- ENDIF --> <!-- ENDIF -->
<!-- INCLUDE timezone_option.html --> <!-- INCLUDE timezone_option.html -->

2
phpBB/styles/subsilver2/template/ucp_prefs_personal.html
View file

@ -49,7 +49,7 @@
<!-- IF S_STYLE_OPTIONS and S_MORE_STYLES --> <!-- IF S_STYLE_OPTIONS and S_MORE_STYLES -->
<tr> <tr>
<td class="row1" width="50%"><b class="genmed">{L_BOARD_STYLE}{L_COLON}</b></td> <td class="row1" width="50%"><b class="genmed">{L_BOARD_STYLE}{L_COLON}</b></td>
<td class="row2"><select name="style">{S_STYLE_OPTIONS}</select></td> <td class="row2"><select name="user_style">{S_STYLE_OPTIONS}</select></td>
</tr> </tr>
<!-- ENDIF --> <!-- ENDIF -->
<!-- INCLUDE timezone_option.html --> <!-- INCLUDE timezone_option.html -->