From b5431bb24f1c895492317c082f681d9190281bb0 Mon Sep 17 00:00:00 2001
From: Naomi Aro <naomiaro@gmail.com>
Date: Wed, 3 Aug 2011 15:48:37 +0200
Subject: [PATCH] CC-2621 : Support upgrades from 1.7.0

---
 install_minimal/include/AirtimeInstall.php | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/install_minimal/include/AirtimeInstall.php b/install_minimal/include/AirtimeInstall.php
index 904cbe8f1..e28263b38 100644
--- a/install_minimal/include/AirtimeInstall.php
+++ b/install_minimal/include/AirtimeInstall.php
@@ -66,20 +66,17 @@ class AirtimeInstall
             $version = $CC_DBC->GetOne($sql);
 
             if (PEAR::isError($version)) {
-                return null;
+                $sql = "SELECT * FROM cc_show_rebroadcast LIMIT 1";
+                $result = $CC_DBC->GetOne($sql);
+                if (!PEAR::isError($result)) {
+                    $version = "1.7.0";
+                    //echo "Airtime Version: ".$version." ".PHP_EOL;
+                }
+                else {
+                    $version = false;
+                }
             }
 
-            $sql = "SELECT * FROM cc_show_rebroadcast LIMIT 1";
-            $result = $CC_DBC->GetOne($sql);
-            if (!PEAR::isError($result)) {
-                $version = "1.7.0";
-                //echo "Airtime Version: ".$version." ".PHP_EOL;
-            }
-
-            // no version string detected
-            if($version == ''){
-                $version = false;
-            }
             return $version;
         }
     }