From 783da3064a2a4e7163230b75cacb6ef7073493dc Mon Sep 17 00:00:00 2001
From: Henry Sudhof <kellanved@phpbb.com>
Date: Mon, 20 Jul 2009 18:27:26 +0000
Subject: rename variables to avoid name clashes in aggregating plugins

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9808 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/styles/prosilver/template/captcha_qa.html  | 6 +++---
 phpBB/styles/subsilver2/template/captcha_qa.html | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/template/captcha_qa.html b/phpBB/styles/prosilver/template/captcha_qa.html
index e363ee008d..375ae401a4 100644
--- a/phpBB/styles/prosilver/template/captcha_qa.html
+++ b/phpBB/styles/prosilver/template/captcha_qa.html
@@ -7,10 +7,10 @@
 <!-- ENDIF -->
 
 	<dl>
-	<dt><label>{CONFIRM_QUESTION}</label>:<br /><span>{L_CONFIRM_QUESTION_EXPLAIN}</span></dt>
+	<dt><label>{QA_CONFIRM_QUESTION}</label>:<br /><span>{L_CONFIRM_QUESTION_EXPLAIN}</span></dt>
 	<dd>
-		<input type="text" tabindex="10" name="answer" id="answer" size="45"  class="inputbox autowidth" title="{L_ANSWER}" />
-		<input type="hidden" name="confirm_id" id="confirm_id" value="{CONFIRM_ID}" />
+		<input type="text" tabindex="10" name="qa_answer" id="answer" size="45"  class="inputbox autowidth" title="{L_ANSWER}" />
+		<input type="hidden" name="confirm_id" id="qa_confirm_id" value="{QA_CONFIRM_ID}" />
 	</dd>
 	</dl>
 
diff --git a/phpBB/styles/subsilver2/template/captcha_qa.html b/phpBB/styles/subsilver2/template/captcha_qa.html
index 08b267b8fb..1711bdb90d 100644
--- a/phpBB/styles/subsilver2/template/captcha_qa.html
+++ b/phpBB/styles/subsilver2/template/captcha_qa.html
@@ -1,5 +1,5 @@
 	<tr>
-		<td class="row1"><b class="genmed">{CONFIRM_QUESTION}: </b><br /></td>
-		<td class="row2"><input class="post" type="text" name="answer" size="80"  /></td>
-		<input type="hidden" name="confirm_id" id="confirm_id" value="{CONFIRM_ID}" /></td>
+		<td class="row1"><b class="genmed">{QA_CONFIRM_QUESTION}: </b><br /></td>
+		<td class="row2"><input class="post" type="text" name="qa_answer" size="80"  /></td>
+		<input type="hidden" name="qa_confirm_id" id="confirm_id" value="{QA_CONFIRM_ID}" /></td>
 	</tr>
\ No newline at end of file
-- 
cgit v1.2.1