diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2010-11-06 18:56:01 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2010-11-06 18:56:01 +0100 |
| commit | b60892d200247b4d608806f2172f681001cfa64b (patch) | |
| tree | 7b673d1e7e0d7e37cb955c901a71aeecdb7a9ec6 /phpBB/styles | |
| parent | f164906d77d3c8cb5650bb1e70db8e233f726d4c (diff) | |
| parent | 516282dfa9f07bc0534f260462eceabc5531d33b (diff) | |
| download | forums-b60892d200247b4d608806f2172f681001cfa64b.tar forums-b60892d200247b4d608806f2172f681001cfa64b.tar.gz forums-b60892d200247b4d608806f2172f681001cfa64b.tar.bz2 forums-b60892d200247b4d608806f2172f681001cfa64b.tar.xz forums-b60892d200247b4d608806f2172f681001cfa64b.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/9827] No longer emulate Internet Explorer 7 when using IE9.
[ticket/9850] Display upgrade instructions for feature release in acp
[ticket/9835] subsilver2: Don't show "To prevent automated ..." when logging in
Diffstat (limited to 'phpBB/styles')
| -rw-r--r-- | phpBB/styles/prosilver/template/overall_header.html | 2 | ||||
| -rw-r--r-- | phpBB/styles/subsilver2/template/captcha_default.html | 2 | ||||
| -rw-r--r-- | phpBB/styles/subsilver2/template/overall_header.html | 2 |
3 files changed, 4 insertions, 2 deletions
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} • <!-- IF S_IN_MCP -->{L_MCP} • <!-- ELSEIF S_IN_UCP -->{L_UCP} • <!-- ENDIF -->{PAGE_TITLE}</title> 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> 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} • <!-- IF S_IN_MCP -->{L_MCP} • <!-- ELSEIF S_IN_UCP -->{L_UCP} • <!-- ENDIF -->{PAGE_TITLE}</title> |