From a009614afb74d31cb790fcdddfbcbcf4ce20fab1 Mon Sep 17 00:00:00 2001 From: narqelion <> Date: Thu, 28 Oct 2010 22:25:10 +0200 Subject: [PATCH 1/3] [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(+) 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 @@ {L_CONFIRM_CODE} + {L_CONFIRM_EXPLAIN} + {L_CONFIRM_CODE} From 857271ebbd7568b6a38fe35b2947ec3a0124128b Mon Sep 17 00:00:00 2001 From: Igor Wiedler Date: Tue, 2 Nov 2010 07:49:40 +0100 Subject: [PATCH 2/3] [ticket/9850] Display upgrade instructions for feature release in acp PHPBB3-9850 --- phpBB/adm/style/acp_update.html | 6 ++++++ phpBB/includes/acp/acp_update.php | 10 ++++++++++ phpBB/includes/functions_admin.php | 2 +- phpBB/language/en/install.php | 1 + 4 files changed, 18 insertions(+), 1 deletion(-) diff --git a/phpBB/adm/style/acp_update.html b/phpBB/adm/style/acp_update.html index 34d4f6934e..a87366a78b 100644 --- a/phpBB/adm/style/acp_update.html +++ b/phpBB/adm/style/acp_update.html @@ -18,6 +18,12 @@ + +
+

{UPGRADE_INSTRUCTIONS}

+
+ +
diff --git a/phpBB/includes/acp/acp_update.php b/phpBB/includes/acp/acp_update.php index 3204e0204e..b0ce8f1084 100644 --- a/phpBB/includes/acp/acp_update.php +++ b/phpBB/includes/acp/acp_update.php @@ -51,6 +51,14 @@ class acp_update $announcement_url = (strpos($announcement_url, '&') === false) ? str_replace('&', '&', $announcement_url) : $announcement_url; $update_link = append_sid($phpbb_root_path . 'install/index.' . $phpEx, 'mode=update'); + // next feature release + $next_feature_version = $next_feature_announcement_url = false; + if (isset($info[2]) && trim($info[2]) !== '') + { + $next_feature_version = trim($info[2]); + $next_feature_announcement_url = trim($info[3]); + } + // Determine automatic update... $sql = 'SELECT config_value FROM ' . CONFIG_TABLE . " @@ -74,8 +82,10 @@ class acp_update 'LATEST_VERSION' => $latest_version, 'CURRENT_VERSION' => $config['version'], 'AUTO_VERSION' => $version_update_from, + 'NEXT_FEATURE_VERSION' => $next_feature_version, 'UPDATE_INSTRUCTIONS' => sprintf($user->lang['UPDATE_INSTRUCTIONS'], $announcement_url, $update_link), + 'UPGRADE_INSTRUCTIONS' => $next_feature_version ? $user->lang('UPGRADE_INSTRUCTIONS', $next_feature_version, $next_feature_announcement_url) : false, )); } } diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php index 3178d35c34..2aa12adb2e 100644 --- a/phpBB/includes/functions_admin.php +++ b/phpBB/includes/functions_admin.php @@ -3299,7 +3299,7 @@ function obtain_latest_version_info($force_update = false, $warn_fail = false, $ $errstr = ''; $errno = 0; - $info = get_remote_file('www.phpbb.com', '/updatecheck', + $info = get_remote_file('version.phpbb.com', '/phpbb', ((defined('PHPBB_QA')) ? '30x_qa.txt' : '30x.txt'), $errstr, $errno); if ($info === false) diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php index 4e58de8d90..14923e836e 100644 --- a/phpBB/language/en/install.php +++ b/phpBB/language/en/install.php @@ -559,6 +559,7 @@ $lang = array_merge($lang, array( 'UPDATING_DATA' => 'Updating data', 'UPDATING_TO_LATEST_STABLE' => 'Updating database to latest stable release', 'UPDATED_VERSION' => 'Updated version', + 'UPGRADE_INSTRUCTIONS' => 'A new feature release %1$s is available. Please read the release announcement to learn about what it has to offer, and how to upgrade.', 'UPLOAD_METHOD' => 'Upload method', 'UPDATE_DB_SUCCESS' => 'Database update was successful.', From 3b7414fca8576213f074095ff14118f5be3f8d9d Mon Sep 17 00:00:00 2001 From: Adam Reyher Date: Wed, 15 Sep 2010 23:59:18 -0400 Subject: [PATCH 3/3] [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(-) 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} {SITENAME} • <!-- IF S_IN_MCP -->{L_MCP} • <!-- ELSEIF S_IN_UCP -->{L_UCP} • <!-- ENDIF -->{PAGE_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} {SITENAME} • <!-- IF S_IN_MCP -->{L_MCP} • <!-- ELSEIF S_IN_UCP -->{L_UCP} • <!-- ENDIF -->{PAGE_TITLE}