From 69032db3d526591b88f5c6305cf3bb4402552a44 Mon Sep 17 00:00:00 2001
From: Peter Rotich <peter@osticket.com>
Date: Thu, 28 Jun 2012 01:04:18 -0400
Subject: [PATCH] Change upgrader landing page to prereq page
---
include/upgrader/prereq.inc.php | 2 +-
include/upgrader/upgrade.inc.php | 2 +-
scp/upgrade.php | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/include/upgrader/prereq.inc.php b/include/upgrader/prereq.inc.php
index ae77e1161..814c76fff 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 73fac12bf..c17b1b9cd 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 e7766bb0d..d13dc4c33 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())
--
GitLab