diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-08-02 13:56:16 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-08-02 13:56:16 +0200 |
| commit | c991b1d587e8ab3b080e2e6762646efe00e05bc5 (patch) | |
| tree | 308ca2160ff750b2a316b02cafdd02b1a0e921ed /phpBB/styles | |
| parent | 66f859d109086257bbc1644ace7cc55c110528f1 (diff) | |
| parent | 98eeaacc3611f9e6714bab05c3517db78b815046 (diff) | |
| download | forums-c991b1d587e8ab3b080e2e6762646efe00e05bc5.tar forums-c991b1d587e8ab3b080e2e6762646efe00e05bc5.tar.gz forums-c991b1d587e8ab3b080e2e6762646efe00e05bc5.tar.bz2 forums-c991b1d587e8ab3b080e2e6762646efe00e05bc5.tar.xz forums-c991b1d587e8ab3b080e2e6762646efe00e05bc5.zip | |
Merge pull request #2782 from marc1706/ticket/12895
[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
Diffstat (limited to 'phpBB/styles')
| -rw-r--r-- | phpBB/styles/prosilver/template/ucp_prefs_personal.html | 4 | ||||
| -rw-r--r-- | phpBB/styles/subsilver2/template/ucp_prefs_personal.html | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/styles/prosilver/template/ucp_prefs_personal.html b/phpBB/styles/prosilver/template/ucp_prefs_personal.html index d07aab1a89..c8b028f83a 100644 --- a/phpBB/styles/prosilver/template/ucp_prefs_personal.html +++ b/phpBB/styles/prosilver/template/ucp_prefs_personal.html @@ -58,8 +58,8 @@ <!-- ENDIF --> <!-- IF S_STYLE_OPTIONS and S_MORE_STYLES --> <dl> - <dt><label for="style">{L_BOARD_STYLE}{L_COLON}</label></dt> - <dd><select name="style" id="style">{S_STYLE_OPTIONS}</select></dd> + <dt><label for="user_style">{L_BOARD_STYLE}{L_COLON}</label></dt> + <dd><select name="user_style" id="user_style">{S_STYLE_OPTIONS}</select></dd> </dl> <!-- ENDIF --> <!-- INCLUDE timezone_option.html --> diff --git a/phpBB/styles/subsilver2/template/ucp_prefs_personal.html b/phpBB/styles/subsilver2/template/ucp_prefs_personal.html index 93fcfac5b1..1c76e3226d 100644 --- a/phpBB/styles/subsilver2/template/ucp_prefs_personal.html +++ b/phpBB/styles/subsilver2/template/ucp_prefs_personal.html @@ -49,7 +49,7 @@ <!-- IF S_STYLE_OPTIONS and S_MORE_STYLES --> <tr> <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> <!-- ENDIF --> <!-- INCLUDE timezone_option.html --> |