From e7501e7337fa323681187ee305d7af316ed15d97 Mon Sep 17 00:00:00 2001
From: Peter Rotich <peter@osticket.com>
Date: Tue, 26 Jun 2012 10:44:23 -0400
Subject: [PATCH] Fix upgrader ref. and file paths
---
setup/inc/class.installer.php | 2 +-
setup/inc/file-unclean.inc.php | 2 +-
setup/setup.inc.php | 4 ++++
3 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/setup/inc/class.installer.php b/setup/inc/class.installer.php
index 7b3dbe534..7791d9f4b 100644
--- a/setup/inc/class.installer.php
+++ b/setup/inc/class.installer.php
@@ -13,7 +13,7 @@
vim: expandtab sw=4 ts=4 sts=4:
**********************************************************************/
-require_once INC_DIR.'class.setup.php';
+require_once INCLUDE_DIR.'class.setup.php';
class Installer extends SetupWizard {
diff --git a/setup/inc/file-unclean.inc.php b/setup/inc/file-unclean.inc.php
index 1de4607e8..309fad10b 100644
--- a/setup/inc/file-unclean.inc.php
+++ b/setup/inc/file-unclean.inc.php
@@ -4,7 +4,7 @@ if(!defined('SETUPINC')) die('Kwaheri!');
<div id="main">
<h1 style="color:#FF7700;">osTicket is already installed?</h1>
<div id="intro">
- <p>Configuration file already changed - which could mean osTicket is already installed or the config file is currupted. If you are trying to upgrade osTicket, then <a href="upgrade.php" >click here</a>.</p>
+ <p>Configuration file already changed - which could mean osTicket is already installed or the config file is currupted. If you are trying to upgrade osTicket, then go to <a href="../scp/" >Admin Panel</a>.</p>
<p>If you believe this is in error, please try replacing the config file with a unchanged template copy and try again or get technical help.</p>
<p>Refer to the <a target="_blank" href="http://osticket.com/wiki/Installation">Installation Guide</a> on the wiki for more information.</p>
diff --git a/setup/setup.inc.php b/setup/setup.inc.php
index c2b404c74..5ccd831ab 100644
--- a/setup/setup.inc.php
+++ b/setup/setup.inc.php
@@ -14,6 +14,9 @@
vim: expandtab sw=4 ts=4 sts=4:
**********************************************************************/
+#This version - changed on every release
+define('THIS_VERSION', '1.7-DPR4');
+
#inits
error_reporting(E_ALL ^ E_NOTICE); //turn on errors??
ini_set('magic_quotes_gpc', 0);
@@ -52,6 +55,7 @@ ini_set('include_path', './'.PATH_SEPARATOR.INC_DIR.PATH_SEPARATOR.INCLUDE_DIR.P
endif;
#required files
+require_once(INCLUDE_DIR.'class.setup.php');
require_once(INCLUDE_DIR.'class.validator.php');
require_once(INCLUDE_DIR.'class.passwd.php');
require_once(INCLUDE_DIR.'class.format.php');
--
GitLab