Heacy rewrite/cleanup:

[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 91da8e922bd3f000ef1083c7661bf03f028b9c59..886795351f665285d767503f752d45fd220ac5fb 100644 (file)
--- a/inc/loader/load-points_data.php
+++ b/inc/loader/load-points_data.php
@@ -38,8 +38,9 @@
 // Some security stuff...
 if (!defined('__SECURITY')) {
        die();
-} elseif (isInstallationPhase()) {
+} elseif (isInstaller()) {
        // Do not run in installation phase
+       //* DEBUG: */ logDebugMessage(__FILE__, __LINE__, 'Run from installation phase.');
        return FALSE;
 } elseif (!isExtensionInstalledAndNewer('sql_patches', '0.8.0')) {
        // Is not installed or recent enough
@@ -78,15 +79,15 @@ 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()) && (isExtensionInstalledAndNewer('sql_patches', '0.8.6'))) {
+} elseif (((isHtmlOutputMode()) || (isAjaxOutputMode()) || (isRawOutputMode())) && (isExtensionInstalledAndNewer('sql_patches', '0.8.6'))) {
        // Create cache file
        $GLOBALS['cache_instance']->init();
 
        // Query the database about this
        $result = sqlQuery('SELECT * FROM `{?_MYSQL_PREFIX?}_points_data` ORDER BY `id` ASC', __FILE__, __LINE__);
-       while ($dummy = sqlFetchArray($result)) {
+       while ($data = sqlFetchArray($result)) {
                // Save row
-               $GLOBALS['cache_instance']->addRow($dummy);
+               $GLOBALS['cache_instance']->addRow($data);
        } // END - while
 
        // Free memory