Rewrote a lot parts to extract 'payments' table (+ handling) into own extension:

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

diff --git a/inc/loader/load-imprint.php b/inc/loader/load-imprint.php
index d904fd9cf60f10186424e033bd9f56a9a80a29c0..05031b4e3b31e95c2cb821ae1eedf5e136667b01 100644 (file)
--- a/inc/loader/load-imprint.php
+++ b/inc/loader/load-imprint.php
@@ -39,24 +39,21 @@
 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('imprint')) {
-       // Not not cache if not installed!
-       return;
+       // Do not cache if not installed!
+       return FALSE;
 }
 
 // Let's start with the admins table...
 if (($GLOBALS['cache_instance']->loadCacheFile('imprint')) && ($GLOBALS['cache_instance']->extensionVersionMatches('imprint'))) {
        // Load cache
        $GLOBALS['cache_array']['imprint'] = $GLOBALS['cache_instance']->getArrayFromCache();
-} elseif (isHtmlOutputMode()) {
+} elseif ((isHtmlOutputMode()) || (isRawOutputMode())) {
        // Create cache file
        $GLOBALS['cache_instance']->init();
 
-       // Load every data from DB to cache file
-       $add = runFilterChain('sql_admin_extra_data');
-
        // Query the database about this
        $result = SQL_QUERY('SELECT * FROM `{?_MYSQL_PREFIX?}_imprint_data` ORDER BY `imprint_id` ASC', __FILE__, __LINE__);
        while ($row = SQL_FETCHARRAY($result)) {