X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Floader%2Fload_cache-them.php;h=a6eb3cb4a734e6f924a105a86c990d9f42ab4846;hb=5119510b066e7d05bceb19fd24a2287113a6190f;hp=da82aac80e20248ccd3617a9191baebdf946e0b6;hpb=1ebf518b9552f71ee95de6f4b80e6de3a27716d1;p=mailer.git

diff --git a/inc/loader/load_cache-them.php b/inc/loader/load_cache-them.php
index da82aac80e..a6eb3cb4a7 100644
--- a/inc/loader/load_cache-them.php
+++ b/inc/loader/load_cache-them.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 09/15/2008 *
- * ===============                              Last change: 09/15/2008 *
+ * Mailer v0.2.1-FINAL                                Start: 09/15/2008 *
+ * ===================                          Last change: 09/15/2008 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : load_cache-them.php                              *
@@ -14,10 +14,9 @@
  * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author::                                                          $ *
- * Needs to be in all Files and every File needs "svn propset           *
- * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -44,6 +43,9 @@ if (!defined('__SECURITY')) {
 	return false;
 }
 
+// Use this code if you don't want to run this cache loader on installation phase
+if (isInstallationPhase()) return;
+
 // Next cached table is the referal system (themes)...
 if (($GLOBALS['cache_instance']->loadCacheFile('themes')) && ($GLOBALS['cache_instance']->extensionVersionMatches('theme'))) {
 	// Load referal system from cache
@@ -68,12 +70,12 @@ if (($GLOBALS['cache_instance']->loadCacheFile('themes')) && ($GLOBALS['cache_in
 
 	// Remove dummy array
 	unset($cache);
-} elseif (getOutputMode() != '1') {
+} elseif (isHtmlOutputMode()) {
 	// Create cache file here
-	$GLOBALS['cache_instance']->init('THEMES');
+	$GLOBALS['cache_instance']->init();
 
 	// Load all themes and their data
-	if (getExtensionVersion('theme') >= '0.0.7') {
+	if (isExtensionInstalledAndNewer('theme', '0.0.7')) {
 		$result = SQL_QUERY('SELECT id, theme_path, theme_active, theme_ver, theme_name FROM `{?_MYSQL_PREFIX?}_themes` ORDER BY `id`', __FILE__, __LINE__);
 	} else {
 		$result = SQL_QUERY('SELECT id, theme_path, theme_active, theme_ver FROM `{?_MYSQL_PREFIX?}_themes` ORDER BY `id`', __FILE__, __LINE__);
@@ -89,9 +91,6 @@ if (($GLOBALS['cache_instance']->loadCacheFile('themes')) && ($GLOBALS['cache_in
 	// Close the cache
 	$GLOBALS['cache_instance']->storeExtensionVersion('theme');
 	$GLOBALS['cache_instance']->finalize();
-
-	// Include loader again
-	loadInclude('inc/loader/'.basename(__FILE__));
 }
 
 // [EOF]