X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Floader%2Fload-;h=d912ecea2bfe8032ba15654ca2887e078bf93d08;hp=de62187ebb7266f4d234a051a670fca02168831d;hb=e5dffd4249c97200cbad02f3f4eaf5c373fdb89a;hpb=20741b93fd58620af677a7f1039ffd16ea6ec689

diff --git a/inc/loader/load- b/inc/loader/load-
index de62187ebb..d912ecea2b 100644
--- a/inc/loader/load-
+++ b/inc/loader/load-
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2011 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,31 +38,29 @@
 // Some security stuff...
 if (!defined('__SECURITY')) {
 	die();
-} elseif (isInstallationPhase()) {
+} elseif (isInstaller()) {
 	// Use this code if you don't want to run this cache loader on installation phase
-	return;
+	//* 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 (isHtmlOutputMode()) {
+} 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');