Added caching of 'payments' table, rewrote another 'else' block

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

diff --git a/inc/loader/load-points_data.php b/inc/loader/load-points_data.php
index 744b616ba7103ccf18e5bdf7894e7704b7511136..220567a81ae3ac866b73189bd6c86e64a9fc7d23 100644 (file)
--- a/inc/loader/load-points_data.php
+++ b/inc/loader/load-points_data.php
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
+ * 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 *
@@ -48,13 +48,22 @@ if (($GLOBALS['cache_instance']->loadCacheFile('points_data')) && ($GLOBALS['cac
        // Load cache
        $GLOBALS['cache_array']['points_data'] = $GLOBALS['cache_instance']->getArrayFromCache();
 
+       // Do we have cache?
+       if (!isset($GLOBALS['cache_array']['points_data']['subject'])) {
+               // Try to remove the cache file
+               $GLOBALS['cache_instance']->removeCacheFile();
+
+               // Not found, so better abort here
+               reportBug(__FILE__, __LINE__, 'points_data has been generated, but does not contain "subject". Please try to reload to fix this.');
+       } // END - if
+
        // Init temporary array
        $pointsData = array();
 
        // Rewrite all to subject
-       foreach ($GLOBALS['cache_array']['points_data']['subject'] as $key=>$subject) {
+       foreach ($GLOBALS['cache_array']['points_data']['subject'] as $key => $subject) {
                // Re-add key with subject
-               foreach ($GLOBALS['cache_array']['points_data'] as $key2=>$array) {
+               foreach ($GLOBALS['cache_array']['points_data'] as $key2 => $array) {
                        // Is key2 not 'subject'?
                        if ($key2 != 'subject') {
                                // Then Add it
@@ -66,7 +75,7 @@ if (($GLOBALS['cache_instance']->loadCacheFile('points_data')) && ($GLOBALS['cac
        // Set the array back and remove temporary
        $GLOBALS['cache_array']['points_data'] = $pointsData;
        unset($pointsData);
-} elseif (isHtmlOutputMode()) {
+} elseif ((isHtmlOutputMode()) && (isExtensionInstalledAndNewer('sql_patches', '0.8.6'))) {
        // Create cache file
        $GLOBALS['cache_instance']->init();