diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2019-06-05 21:22:32 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2019-06-05 21:22:32 +0200 |
| commit | 183d1afcaa780f09ae5cd431f9099e01bbf37e80 (patch) | |
| tree | 3b7cfce6856cf4f9fa81cc82e90cf416494409fb /phpBB/includes | |
| parent | 99d83673f5e785eb63ef726187889197bb0c938a (diff) | |
| parent | ddc9a4dff625e725f2be127007bded1267c800b2 (diff) | |
| download | forums-183d1afcaa780f09ae5cd431f9099e01bbf37e80.tar forums-183d1afcaa780f09ae5cd431f9099e01bbf37e80.tar.gz forums-183d1afcaa780f09ae5cd431f9099e01bbf37e80.tar.bz2 forums-183d1afcaa780f09ae5cd431f9099e01bbf37e80.tar.xz forums-183d1afcaa780f09ae5cd431f9099e01bbf37e80.zip | |
Merge branch '3.2.x' into 3.3.x
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/acp/acp_update.php | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/phpBB/includes/acp/acp_update.php b/phpBB/includes/acp/acp_update.php index 9124a59ef2..fa3afa6ce3 100644 --- a/phpBB/includes/acp/acp_update.php +++ b/phpBB/includes/acp/acp_update.php @@ -59,17 +59,19 @@ class acp_update $update_link = $phpbb_root_path . 'install/app.' . $phpEx; - $template->assign_vars(array( - 'S_UP_TO_DATE' => empty($updates_available), - 'U_ACTION' => $this->u_action, - 'U_VERSIONCHECK_FORCE' => append_sid($this->u_action . '&versioncheck_force=1'), + $template_ary = [ + 'S_UP_TO_DATE' => empty($updates_available), + 'U_ACTION' => $this->u_action, + 'U_VERSIONCHECK_FORCE' => append_sid($this->u_action . '&versioncheck_force=1'), - 'CURRENT_VERSION' => $config['version'], + 'CURRENT_VERSION' => $config['version'], - 'UPDATE_INSTRUCTIONS' => sprintf($user->lang['UPDATE_INSTRUCTIONS'], $update_link), + 'UPDATE_INSTRUCTIONS' => $user->lang('UPDATE_INSTRUCTIONS', $update_link), 'S_VERSION_UPGRADEABLE' => !empty($upgrades_available), 'UPGRADE_INSTRUCTIONS' => !empty($upgrades_available) ? $user->lang('UPGRADE_INSTRUCTIONS', $upgrades_available['current'], $upgrades_available['announcement']) : false, - )); + ]; + + $template->assign_vars($template_ary); // Incomplete update? if (phpbb_version_compare($config['version'], PHPBB_VERSION, '<')) |