diff options
Diffstat (limited to 'phpBB/includes/acp/acp_update.php')
| -rw-r--r-- | phpBB/includes/acp/acp_update.php | 31 |
1 files changed, 27 insertions, 4 deletions
diff --git a/phpBB/includes/acp/acp_update.php b/phpBB/includes/acp/acp_update.php index b0ce8f1084..fb2d20a6a4 100644 --- a/phpBB/includes/acp/acp_update.php +++ b/phpBB/includes/acp/acp_update.php @@ -50,14 +50,16 @@ class acp_update $announcement_url = trim($info[1]); $announcement_url = (strpos($announcement_url, '&') === false) ? str_replace('&', '&', $announcement_url) : $announcement_url; $update_link = append_sid($phpbb_root_path . 'install/index.' . $phpEx, 'mode=update'); - + // www.phpBB-SEO.com SEO TOOLKIT BEGIN + // moved a little bellow // next feature release - $next_feature_version = $next_feature_announcement_url = false; + /*$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]); - } + }*/ + // www.phpBB-SEO.com SEO TOOLKIT BEGIN // Determine automatic update... $sql = 'SELECT config_value @@ -71,7 +73,28 @@ class acp_update $up_to_date_automatic = (version_compare(str_replace('rc', 'RC', strtolower($current_version)), str_replace('rc', 'RC', strtolower($latest_version)), '<')) ? false : true; $up_to_date = (version_compare(str_replace('rc', 'RC', strtolower($config['version'])), str_replace('rc', 'RC', strtolower($latest_version)), '<')) ? false : true; - + // www.phpBB-SEO.com SEO TOOLKIT BEGIN + $phpbb_seo_update = ''; + if ($up_to_date) { + $phpbb_seo_update = trim(str_replace($current_version, '', $latest_version)); + } + $update_instruction = sprintf($user->lang['UPDATE_INSTRUCTIONS'], $announcement_url, $update_link); + if (!empty($phpbb_seo_update)) { + $auto_package = trim($info[2]); + $auto_update = $auto_package === 'auto_update:yes' ? true : false; + $up_to_date = ($latest_version === @$config['seo_premod_version']) ? true : false; + if (!$auto_update) { + $update_instruction = '<br/><br/><hr/>' . sprintf($user->lang['ACP_PREMOD_UPDATE'], $latest_version, $announcement_url) . '<br/><hr/>'; + } + } + // next feature release + $next_feature_version = $next_feature_announcement_url = false; + if (isset($info[3]) && trim($info[3]) !== '') + { + $next_feature_version = trim($info[3]); + $next_feature_announcement_url = trim($info[4]); + } + // www.phpBB-SEO.com SEO TOOLKIT END $template->assign_vars(array( 'S_UP_TO_DATE' => $up_to_date, 'S_UP_TO_DATE_AUTO' => $up_to_date_automatic, |