X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Floader%2Fload-payments.php;h=3d72aec7f24790a39ea745edc733c62ddca1b175;hb=15e0995f7a4a4b2c9b1b1a9273f785cf13605829;hp=b4a9375b2fc8fbce310329f0712b5ca6c7505c68;hpb=b679042bd22371aa267e595db8d0e08941afc9eb;p=mailer.git

diff --git a/inc/loader/load-payments.php b/inc/loader/load-payments.php
index b4a9375b2f..3d72aec7f2 100644
--- a/inc/loader/load-payments.php
+++ b/inc/loader/load-payments.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,9 +38,10 @@
 // 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;
 }
 
 // Let's start with the admins table...
@@ -66,22 +67,19 @@ if (($GLOBALS['cache_instance']->loadCacheFile('payments')) && ($GLOBALS['cache_
 	// Set the array back and remove temporary
 	$GLOBALS['cache_array']['payments'] = $paymentsData;
 	unset($paymentsData);
-} 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?}_payments` ORDER BY `id` ASC', __FILE__, __LINE__);
-	while ($dummy = SQL_FETCHARRAY($result)) {
+	$result = sqlQuery('SELECT * FROM `{?_MYSQL_PREFIX?}_payments` ORDER BY `id` 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('payments');