Removed double-update (0.2.1) for ext-doubler as it caused SQL error (which needs...

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

diff --git a/inc/loader/load-imprint.php b/inc/loader/load-imprint.php
index ab2f389025d3a3dc8f7982b30b0cd4e0e8b856a5..e8303d343876a2944f1aa7e097ff2b891cae5192 100644 (file)
--- a/inc/loader/load-imprint.php
+++ b/inc/loader/load-imprint.php
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * Copyright (c) 2009 - 2013 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -38,34 +38,32 @@
 // Some security stuff...
 if (!defined('__SECURITY')) {
        die();
-} elseif (isInstallationPhase()) {
-       // Use this code if you don't want to run this cache loader on installation phase
-       return;
+} elseif (isInstaller()) {
+       // Do not run in installation phase
+       //* DEBUG: */ logDebugMessage(__FILE__, __LINE__, 'Run from 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()) || (isRawOutputMode())) {
+} elseif ((isHtmlOutputMode()) || (isAjaxOutputMode()) || (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)) {
+       $result = sqlQuery('SELECT * FROM `{?_MYSQL_PREFIX?}_imprint_data` ORDER BY `imprint_id` ASC', __FILE__, __LINE__);
+       while ($row = sqlFetchArray($result)) {
                // Save row
                $GLOBALS['cache_instance']->addRow($row);
        } // END - while
 
        // Free memory
-       SQL_FREERESULT($result);
+       sqlFreeResult($result);
 
        // Close cache
        $GLOBALS['cache_instance']->storeExtensionVersion('imprint');