Commit 4f741fef authored by Richard Mansfield's avatar Richard Mansfield

Use 'install' or 'upgrade' on upgrade page title/heading depending on whether...

Use 'install' or 'upgrade' on upgrade page title/heading depending on whether it's an install or an upgrade (bug 3371)
Signed-off-by: default avatarRichard Mansfield <richardm@catalyst.net.nz>
parent c51a7213
......@@ -30,12 +30,20 @@ define('ADMIN', 1);
define('INSTALLER', 1);
require(dirname(dirname(__FILE__)).'/init.php');
define('TITLE', get_string('upgrades', 'admin'));
require(get_config('libroot') . 'upgrade.php');
$smarty = smarty();
$upgrades = check_upgrades();
if (!empty($upgrades['core']->install)) {
define('TITLE', get_string('installation', 'admin'));
$smarty->assign('upgradeheading', get_string('performinginstallation', 'admin'));
}
else {
define('TITLE', get_string('upgrades', 'admin'));
$smarty->assign('upgradeheading', get_string('performingupgrades', 'admin'));
}
if (empty($upgrades['disablelogin'])) {
auth_setup();
}
......
......@@ -45,7 +45,8 @@ $string['toversion'] = 'To version';
$string['localdatasuccess'] = 'Successfully installed local customisations';
$string['notinstalled'] = 'Not installed';
$string['nothingtoupgrade'] = 'Nothing to upgrade';
$string['performinginstallsandupgrades'] = 'Performing installs and upgrades...';
$string['performinginstallation'] = 'Performing installation...';
$string['performingupgrades'] = 'Performing upgrades...';
$string['runupgrade'] = 'Run upgrade';
$string['successfullyinstalled'] = 'Successfully installed Mahara!';
$string['thefollowingupgradesareready'] = 'The following upgrades are ready:';
......
{include file='header.tpl' nosearch='true'}
<h2 class="center">{str tag=performinginstallsandupgrades section=admin}</h2>
<h2 class="center">{$upgradeheading}</h2>
<div class="center js-hidden" id="jsrequiredforupgrade">{str tag=jsrequiredforupgrade section=admin}</div>
<table id="installer" class="nojs-hidden-table">
<thead>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment