From 4cc275e1befc0ac0fb99508c4e37388914a83b3f Mon Sep 17 00:00:00 2001 From: Robert Sesek Date: Sat, 14 Jul 2007 17:46:10 +0000 Subject: [PATCH] r1575: - Adding the 1.2.0 upgrade path in install/global.php - In install/upgrade.php add some further checks to see if the stored version is invalid --- install/global.php | 3 ++- install/upgrade.php | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/install/global.php b/install/global.php index da3732f..4206a94 100644 --- a/install/global.php +++ b/install/global.php @@ -87,7 +87,8 @@ $bugsys->versions = array( '1.2.0 Beta 1' => 12, '1.2.0 Beta 2' => 13, '1.2.0 Beta 3' => 14, - '1.2.0 Release Candidate 1' => -1 + '1.2.0 Release Candidate 1' => 15, + '1.2.0' => -1 ); // ################################################################### diff --git a/install/upgrade.php b/install/upgrade.php index d3fb6dc..1c75bb6 100644 --- a/install/upgrade.php +++ b/install/upgrade.php @@ -30,9 +30,9 @@ if (!isset($bugsys->in['next'])) $version = $db->query_first("SELECT * FROM " . TABLE_PREFIX . "setting WHERE varname = 'trackerversion'"); $version = $version['value']; - if (!$version) + if (!$version OR $version == '[#]version[#]') { - die('You have done something to your database and this script cannot determine Edoc\'s version... or you have no upgrade to perform...'); + die('You have done something to your database and this script cannot determine Bugdar\'s version... or you have no upgrade to perform...'); } if ($bugsys->versions["$version"] == -1) -- 2.43.5