From cec974157154c2d0679bd88e63d2e6b90c68b770 Mon Sep 17 00:00:00 2001
From: James <james@sourcefabric-DX4840.(none)>
Date: Wed, 27 Jul 2011 12:03:20 -0400
Subject: [PATCH] CC-2596: Upgrade script doesn't recognize existing Airtime
 1.7->1.9

- fixed
- The script will print out error and exit upon detecting any versions
prior to 1.8.0:

A version of Airtime older than 1.8.0 detected, please upgrade to 1.8.0 first.
You will then be able to upgrade to 1.9.0 using this installer.
---
 install_minimal/include/AirtimeInstall.php  | 2 ++
 install_minimal/include/airtime-install.php | 5 +++++
 2 files changed, 7 insertions(+)

diff --git a/install_minimal/include/AirtimeInstall.php b/install_minimal/include/AirtimeInstall.php
index 1459ff2d7..67cebe862 100644
--- a/install_minimal/include/AirtimeInstall.php
+++ b/install_minimal/include/AirtimeInstall.php
@@ -68,6 +68,8 @@ class AirtimeInstall
             if (PEAR::isError($version)) {
                 return null;
             }
+            // no version string detected
+            $version = false;
             return $version;
         }
     }
diff --git a/install_minimal/include/airtime-install.php b/install_minimal/include/airtime-install.php
index 34cc172cb..8fe9e5ef5 100644
--- a/install_minimal/include/airtime-install.php
+++ b/install_minimal/include/airtime-install.php
@@ -71,6 +71,11 @@ if (isset($version) && ($version != false) && ($version < AIRTIME_VERSION) && !i
     exit(2);
 }
 
+if($version == false){
+    echo "A version of Airtime older than 1.8.0 detected, please upgrade to 1.8.0 first.\n";
+    echo "You will then be able to upgrade to 1.9.0 using this installer.\n";
+    exit(3);
+}
 // -------------------------------------------------------------------------
 // The only way we get here is if we are doing a new install or a reinstall.
 // -------------------------------------------------------------------------