diff --git a/airtime_mvc/application/models/Cache.php b/airtime_mvc/application/models/Cache.php deleted file mode 100644 index dbbcb9d58..000000000 --- a/airtime_mvc/application/models/Cache.php +++ /dev/null @@ -1,45 +0,0 @@ -getMessage()); exit; } - - $cache->store($key, $value, $isUserValue, $userId); } /** @@ -143,8 +140,6 @@ class Application_Model_Preference */ private static function getValue($key, $isUserValue = false, $forceDefault = false) { - $cache = new Cache(); - try { $userId = null; @@ -156,10 +151,6 @@ class Application_Model_Preference } } - // If the value is already cached, return it - $res = $cache->fetch($key, $isUserValue, $userId); - if ($res !== false) return $res; - //Check if key already exists $sql = "SELECT COUNT(*) FROM cc_pref" ." WHERE keystr = :key"; @@ -198,7 +189,6 @@ class Application_Model_Preference $res = ($result !== false) ? $result : ""; } - $cache->store($key, $res, $isUserValue, $userId); return $res; } catch (Exception $e) { diff --git a/airtime_mvc/application/upgrade/Upgrades.php b/airtime_mvc/application/upgrade/Upgrades.php index d1ac02ce5..5213ec602 100644 --- a/airtime_mvc/application/upgrade/Upgrades.php +++ b/airtime_mvc/application/upgrade/Upgrades.php @@ -187,18 +187,15 @@ abstract class AirtimeUpgrader * allowing child classes to overwrite _runUpgrade to reduce duplication */ public function upgrade() { - Cache::clear(); assert($this->checkIfUpgradeSupported()); try { // $this->toggleMaintenanceScreen(true); - Cache::clear(); $this->_getDbValues(); $this->_runUpgrade(); Application_Model_Preference::SetSchemaVersion($this->getNewVersion()); - Cache::clear(); // $this->toggleMaintenanceScreen(false); } catch(Exception $e) { @@ -215,7 +212,6 @@ abstract class AirtimeUpgrader * allowing child classes to overwrite _runDowngrade to reduce duplication */ public function downgrade() { - Cache::clear(); try { $this->_getDbValues(); @@ -232,7 +228,6 @@ abstract class AirtimeUpgrader // Set the schema version to the highest supported version so we don't skip versions when downgrading Application_Model_Preference::SetSchemaVersion($highestSupportedVersion); - Cache::clear(); } catch(Exception $e) { return false; }