From 82d53231d20e4a243ef064661e1f9caff6827fa3 Mon Sep 17 00:00:00 2001
From: Paul Baranowski <paul.baranowski@sourcefabric.org>
Date: Tue, 28 Jun 2011 15:30:35 -0400
Subject: [PATCH] CC-2472: Reinstall option is ignored when new version number
 is greater than old version number.  Fixed.

---
 install/include/airtime-install.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/install/include/airtime-install.php b/install/include/airtime-install.php
index b260179a1..7e132d7c2 100644
--- a/install/include/airtime-install.php
+++ b/install/include/airtime-install.php
@@ -54,13 +54,13 @@ if (isset($opts->h)) {
 }
 
 // The current version is already installed.
-if(isset($version) && ($version != false) && ($version == AIRTIME_VERSION) && !isset($opts->r)) {
+if (isset($version) && ($version != false) && ($version == AIRTIME_VERSION) && !isset($opts->r)) {
     echo "Airtime $version is already installed.".PHP_EOL;
     printUsage($opts);
     exit(1);
 }
 // A previous version exists - if so, upgrade.
-if(isset($version) && ($version != false) && ($version < AIRTIME_VERSION)) {
+if (isset($version) && ($version != false) && ($version < AIRTIME_VERSION) && !isset($opts->r)) {
     echo "Airtime version $version found.".PHP_EOL;
 
     echo "It appears you already have a version of Airtime installed.\n";
@@ -84,7 +84,7 @@ if(is_null($version)) {
 }
 
 $db_install = true;
-if (is_null($opts->r) && isset($opts->n)){
+if (is_null($opts->r) && isset($opts->n)) {
 	$db_install = false;
 }