X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Floader%2Fload-points_data.php;h=4c8dd0701b9b3eef0b765979b1d20a64540de677;hb=d1922ab361b5e104b7c14b28c76d1c47651635ef;hp=01457795b65f857f37295b34fd2dfaaff69ea77f;hpb=cd7d344ea7007cfa20413acd3e03e50f0ab86d86;p=mailer.git

diff --git a/inc/loader/load-points_data.php b/inc/loader/load-points_data.php
index 01457795b6..4c8dd0701b 100644
--- a/inc/loader/load-points_data.php
+++ b/inc/loader/load-points_data.php
@@ -10,13 +10,8 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Mehr Cache-Dateien nachladen                     *
  * -------------------------------------------------------------------- *
- * $Revision::                                                        $ *
- * $Date::                                                            $ *
- * $Tag:: 0.2.1-FINAL                                                 $ *
- * $Author::                                                          $ *
- * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2013 by Mailer Developer Team                   *
+ * Copyright (c) 2009 - 2016 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -38,8 +33,9 @@
 // Some security stuff...
 if (!defined('__SECURITY')) {
 	die();
-} elseif (isInstallationPhase()) {
+} elseif (isInstaller()) {
 	// Do not run in installation phase
+	//* DEBUG: */ logDebugMessage(__FILE__, __LINE__, 'Run from installation phase.');
 	return FALSE;
 } elseif (!isExtensionInstalledAndNewer('sql_patches', '0.8.0')) {
 	// Is not installed or recent enough
@@ -78,19 +74,19 @@ if (($GLOBALS['cache_instance']->loadCacheFile('points_data')) && ($GLOBALS['cac
 	// Set the array back and remove temporary
 	$GLOBALS['cache_array']['points_data'] = $pointsData;
 	unset($pointsData);
-} elseif ((isHtmlOutputMode()) && (isExtensionInstalledAndNewer('sql_patches', '0.8.6'))) {
+} elseif (((isHtmlOutputMode()) || (isAjaxOutputMode()) || (isRawOutputMode())) && (isExtensionInstalledAndNewer('sql_patches', '0.8.6'))) {
 	// Create cache file
 	$GLOBALS['cache_instance']->init();
 
 	// Query the database about this
-	$result = SQL_QUERY('SELECT * FROM `{?_MYSQL_PREFIX?}_points_data` ORDER BY `id` ASC', __FILE__, __LINE__);
-	while ($dummy = SQL_FETCHARRAY($result)) {
+	$result = sqlQuery('SELECT * FROM `{?_MYSQL_PREFIX?}_points_data` 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('sql_patches');