From a009614afb74d31cb790fcdddfbcbcf4ce20fab1 Mon Sep 17 00:00:00 2001
From: narqelion <>
Date: Thu, 28 Oct 2010 22:25:10 +0200
Subject: [ticket/9835] subsilver2: Don't show "To prevent automated ..." when
 logging in

This makes subsilver2 consistent with prosilver.

PHPBB3-9835
---
 phpBB/styles/subsilver2/template/captcha_default.html | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/subsilver2/template/captcha_default.html b/phpBB/styles/subsilver2/template/captcha_default.html
index e0116ae42c..4c65f81643 100644
--- a/phpBB/styles/subsilver2/template/captcha_default.html
+++ b/phpBB/styles/subsilver2/template/captcha_default.html
@@ -1,9 +1,11 @@
 	<tr>
 		<th colspan="2" valign="middle">{L_CONFIRM_CODE}</th>
 	</tr>
+	<!-- IF S_TYPE == 1 -->
 	<tr>
 		<td class="row3" colspan="2"><span class="gensmall">{L_CONFIRM_EXPLAIN}</span></td>
 	</tr>
+	<!-- ENDIF -->	
 	<tr>
 		<td class="row1" colspan="2" align="center"><img src="{CONFIRM_IMAGE_LINK}" alt="{L_CONFIRM_CODE}" />
 		<input type="hidden" name="confirm_id" id="confirm_id" value="{CONFIRM_ID}" /></td>
-- 
cgit v1.2.1


From 3b7414fca8576213f074095ff14118f5be3f8d9d Mon Sep 17 00:00:00 2001
From: Adam Reyher <adamr@phpbb.com>
Date: Wed, 15 Sep 2010 23:59:18 -0400
Subject: [ticket/9827] No longer emulate Internet Explorer 7 when using IE9.

The IE9 beta fixes the IE8 textarea width bug which required IE7 emulation in
phpBB's styles. Emulation should only occur when using IE8 now.

PHPBB3-9827
---
 phpBB/styles/prosilver/template/overall_header.html  | 2 +-
 phpBB/styles/subsilver2/template/overall_header.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html
index 8f4ac19fb8..44857dbc41 100644
--- a/phpBB/styles/prosilver/template/overall_header.html
+++ b/phpBB/styles/prosilver/template/overall_header.html
@@ -11,7 +11,7 @@
 <meta name="copyright" content="2000, 2002, 2005, 2007 phpBB Group" />
 <meta name="keywords" content="" />
 <meta name="description" content="" />
-<meta http-equiv="X-UA-Compatible" content="IE=EmulateIE7" />
+<meta http-equiv="X-UA-Compatible" content="IE=EmulateIE7; IE=EmulateIE9" />
 {META}
 <title>{SITENAME} &bull; <!-- IF S_IN_MCP -->{L_MCP} &bull; <!-- ELSEIF S_IN_UCP -->{L_UCP} &bull; <!-- ENDIF -->{PAGE_TITLE}</title>
 
diff --git a/phpBB/styles/subsilver2/template/overall_header.html b/phpBB/styles/subsilver2/template/overall_header.html
index a8a53abd24..874beb8e2b 100644
--- a/phpBB/styles/subsilver2/template/overall_header.html
+++ b/phpBB/styles/subsilver2/template/overall_header.html
@@ -11,7 +11,7 @@
 <meta name="copyright" content="2000, 2002, 2005, 2007 phpBB Group" />
 <meta name="keywords" content="" />
 <meta name="description" content="" />
-<meta http-equiv="X-UA-Compatible" content="IE=EmulateIE7" />
+<meta http-equiv="X-UA-Compatible" content="IE=EmulateIE7; IE=EmulateIE9" />
 {META}
 <title>{SITENAME} &bull; <!-- IF S_IN_MCP -->{L_MCP} &bull; <!-- ELSEIF S_IN_UCP -->{L_UCP} &bull; <!-- ENDIF -->{PAGE_TITLE}</title>
 
-- 
cgit v1.2.1