Swapped all

[mailer.git] / inc / loader / load-earning.php

diff --git a/inc/loader/load-earning.php b/inc/loader/load-earning.php
index 74ae2c1a4f3f1e90b4d1d473df7a4bed81a10635..18180aca1ab4493d91df47d0aecd3de88efae270 100644 (file)
--- a/inc/loader/load-earning.php
+++ b/inc/loader/load-earning.php
@@ -16,8 +16,8 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -39,15 +39,18 @@
 if (!defined('__SECURITY')) {
        die();
 } elseif (isInstallationPhase()) {
-       // Use this code if you don't want to run this cache loader on installation phase
-       return;
+       // Do not run in installation phase
+       return FALSE;
+} elseif (!isExtensionInstalled('earning')) {
+       // Do not cache if not installed!
+       return FALSE;
 }
 
 // Let's start with the admins table...
-if (($GLOBALS['cache_instance']->loadCacheFile('earning')) && ($GLOBALS['cache_instance']->extensionVersionMatches('sql_patches'))) {
+if (($GLOBALS['cache_instance']->loadCacheFile('earning')) && ($GLOBALS['cache_instance']->extensionVersionMatches('earning'))) {
        // Load cache
        $GLOBALS['cache_array']['earning'] = $GLOBALS['cache_instance']->getArrayFromCache();
-} elseif ((isHtmlOutputMode()) && (isExtensionInstalledAndNewer('sql_patches', '0.8.5'))) {
+} elseif ((isHtmlOutputMode()) && (isExtensionInstalled('earning'))) {
        // Create cache file
        $GLOBALS['cache_instance']->init();
 
@@ -62,7 +65,7 @@ if (($GLOBALS['cache_instance']->loadCacheFile('earning')) && ($GLOBALS['cache_i
        SQL_FREERESULT($result);
 
        // Close cache
-       $GLOBALS['cache_instance']->storeExtensionVersion('sql_patches');
+       $GLOBALS['cache_instance']->storeExtensionVersion('earning');
        $GLOBALS['cache_instance']->finalize();
 }