Added update_year.sh (still not fully flexible) and updated all years with it.

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

diff --git a/inc/loader/load- b/inc/loader/load-
index e8ce4032e5b57cb5f644ee6d42dab7720271380e..b8e281886f5b339b66a08d99b2e9ba713f52f9cd 100644 (file)
--- a/inc/loader/load-
+++ b/inc/loader/load-
@@ -4,20 +4,15 @@
  * ===================                          Last change: 10/24/2009 *
  *                                                                      *
  * -------------------------------------------------------------------- *
- * File              : load_cache-                                      *
+ * File              : load-                                            *
  * -------------------------------------------------------------------- *
  * Short description : Load more cache files                            *
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Mehr Cache-Dateien nachladen                     *
  * -------------------------------------------------------------------- *
- * $Revision::                                                        $ *
- * $Date::                                                            $ *
- * $Tag:: 0.2.1-FINAL                                                 $ *
- * $Author::                                                          $ *
- * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2015 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 *
@@ -38,31 +33,29 @@
 // Some security stuff...
 if (!defined('__SECURITY')) {
        die();
-} // END - if
-
-// Use this code if you don't want to run this cache loader on installation phase
-//if (isInstallationPhase()) return;
+} elseif (isInstaller()) {
+       // Use this code if you don't want to run this cache loader on installation phase
+       //* DEBUG: */ logDebugMessage(__FILE__, __LINE__, 'Run from installation phase.');
+       return FALSE;
+}
 
 // Let's start with the admins table...
 if (($GLOBALS['cache_instance']->loadCacheFile('foo')) && ($GLOBALS['cache_instance']->extensionVersionMatches('foo'))) {
        // Load cache
        $GLOBALS['cache_array']['foo'] = $GLOBALS['cache_instance']->getArrayFromCache();
-} elseif (isHtmlMode()) {
+} 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?}_foos` ORDER BY `some_bar` ASC', __FILE__, __LINE__);
-       while ($dummy = SQL_FETCHARRAY($result)) {
+       $result = sqlQuery('SELECT * FROM `{?_MYSQL_PREFIX?}_foos` ORDER BY `some_bar` ASC', __FILE__, __LINE__);
+       while ($data = sqlFetchArray($result)) {
                // Save row
-               $GLOBALS['cache_instance']->addRow($dummy);
+               $GLOBALS['cache_instance']->addRow($data);
        } // END - while
 
        // Free memory
-       SQL_FREERESULT($result);
+       sqlFreeResult($result);
 
        // Close cache
        $GLOBALS['cache_instance']->storeExtensionVersion('foo');