From 98eeaacc3611f9e6714bab05c3517db78b815046 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Tue, 29 Jul 2014 13:21:16 +0200
Subject: [ticket/12895] Rename user style setting to resolve conflict with
 style param

The style URL parameter, i.e. style=1, will conflict with the user's style
setting due to it also being named style. This patch with solve this conflict.

PHPBB3-12895
---
 phpBB/styles/prosilver/template/ucp_prefs_personal.html  | 4 ++--
 phpBB/styles/subsilver2/template/ucp_prefs_personal.html | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'phpBB/styles')

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 -->
-- 
cgit v1.2.1