diff --git a/include/upgrader/prereq.inc.php b/include/upgrader/prereq.inc.php index ae77e116117cfec1a9502e2b4cca931bac9f9bb9..814c76fff32403b227efbf26bcf490f757dc8d83 100644 --- a/include/upgrader/prereq.inc.php +++ b/include/upgrader/prereq.inc.php @@ -12,7 +12,7 @@ if(!defined('OSTSCPINC') || !$thisstaff || !$thisstaff->isAdmin()) die('Access D <h2>Getting ready!</h2> <p>Before we begin, we'll check your server configuration to make sure you meet the minimum requirements to run the latest version of osTicket.</p> <h3>Prerequisites: <font color="red"><?php echo $errors['prereq']; ?></font></h3> - These items are necessary in order to use osTicket the latest version of osTicket. + These items are necessary in order to run the latest version of osTicket. <ul class="progress"> <li class="<? echo $upgrader->check_php()?'yes':'no'; ?>"> PHP v4.3 or greater - (<small><b><?php echo PHP_VERSION; ?></b></small>)</li> diff --git a/include/upgrader/upgrade.inc.php b/include/upgrader/upgrade.inc.php index 73fac12bf04b848d6af047e404fec894b9d7a4ae..c17b1b9cdb5a0d52ca589d7a4918f94845b9458b 100644 --- a/include/upgrader/upgrade.inc.php +++ b/include/upgrader/upgrade.inc.php @@ -26,7 +26,7 @@ $action=$upgrader->getNextAction(); </div> <div id="sidebar"> <h3>Upgrade Tips</h3> - <p>1. Be patient the process will take a couple of seconds.</p> + <p>1. Be patient the process will take a couple of minutes.</p> <p>2. If you experience any problems, you can always restore your files/database backup.</p> <p>3. We can help, feel free to <a href="http://osticket.com/support/" target="_blank">contact us </a> for professional help.</p> </div> diff --git a/scp/upgrade.php b/scp/upgrade.php index e7766bb0d22e1ab8a502450962f4263cda51eb72..d13dc4c3392e90cb7b9e2e225b2a74b244ae002c 100644 --- a/scp/upgrade.php +++ b/scp/upgrade.php @@ -61,7 +61,7 @@ switch(strtolower($upgrader->getState())) { $inc='done.inc.php'; break; default: - $inc='upgrade.inc.php'; + $inc='prereq.inc.php'; if($upgrader->isAborted()) $inc='aborted.inc.php'; elseif(!$ost->isUpgradePending())