diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2010-11-06 18:47:19 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2010-11-06 18:47:19 +0100 |
| commit | 46dbdfdef42f59a69d74a0cd35aeb025298be5c1 (patch) | |
| tree | 731d477973a79d4edc4767f05f73f2e22415bb50 | |
| parent | e3b460a518e46ad910345199ee85e94d3134fd3e (diff) | |
| parent | 857271ebbd7568b6a38fe35b2947ec3a0124128b (diff) | |
| download | forums-46dbdfdef42f59a69d74a0cd35aeb025298be5c1.tar forums-46dbdfdef42f59a69d74a0cd35aeb025298be5c1.tar.gz forums-46dbdfdef42f59a69d74a0cd35aeb025298be5c1.tar.bz2 forums-46dbdfdef42f59a69d74a0cd35aeb025298be5c1.tar.xz forums-46dbdfdef42f59a69d74a0cd35aeb025298be5c1.zip | |
Merge branch 'ticket/igorw/9850' into develop-olympus
* ticket/igorw/9850:
[ticket/9850] Display upgrade instructions for feature release in acp
| -rw-r--r-- | phpBB/adm/style/acp_update.html | 6 | ||||
| -rw-r--r-- | phpBB/includes/acp/acp_update.php | 10 | ||||
| -rw-r--r-- | phpBB/includes/functions_admin.php | 2 | ||||
| -rw-r--r-- | phpBB/language/en/install.php | 1 |
4 files changed, 18 insertions, 1 deletions
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 @@ </div> <!-- ENDIF --> + <!-- IF NEXT_FEATURE_VERSION --> + <div class="errorbox"> + <p>{UPGRADE_INSTRUCTIONS}</p> + </div> + <!-- ENDIF --> + <fieldset> <legend></legend> <dl> 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 <strong>%1$s</strong> is available. Please read <a href="%2$s" title="%2$s"><strong>the release announcement</strong></a> to learn about what it has to offer, and how to upgrade.', 'UPLOAD_METHOD' => 'Upload method', 'UPDATE_DB_SUCCESS' => 'Database update was successful.', |