New wrapper functions introduced

[mailer.git] / inc / loader / load_cache-extension.php

diff --git a/inc/loader/load_cache-extension.php b/inc/loader/load_cache-extension.php
index e4509b218e6c0788690c825628df48efc2a81981..3dc4a04629c8a678893b39c077e1fd07e5970aac 100644 (file)
--- a/inc/loader/load_cache-extension.php
+++ b/inc/loader/load_cache-extension.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 06/26/2004 *
- * ===============                              Last change: 07/01/2005 *
+ * Mailer v0.2.1-FINAL                                Start: 06/26/2004 *
+ * ===================                          Last change: 07/01/2005 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : load_cache-extensions.php                        *
@@ -20,6 +20,7 @@
  * 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 *
@@ -101,7 +102,7 @@ if (($GLOBALS['cache_instance']->loadCacheFile('extension')) && ($GLOBALS['cache
                        $EXT_DUMMY['ext_deprecated'][$name] = 'N';
 
                        // Mark it as active extension
-                       $GLOBALS['cache_array']['active_extensions'][$name] = $EXT_DUMMY['ext_keep'][$k];
+                       $GLOBALS['cache_array']['always_active'][$name] = $EXT_DUMMY['ext_keep'][$k];
                        unset($EXT_DUMMY['ext_keep'][$k]);
 
                        // Remove unneccessary data from memory
@@ -131,7 +132,7 @@ if (($GLOBALS['cache_instance']->loadCacheFile('extension')) && ($GLOBALS['cache
 
        // Remove array and mark cache as loaded
        unset($EXT_POOL);
-} elseif (getOutputMode() != 1) {
+} elseif (isHtmlOutputMode()) {
        // Create cache file here
        $GLOBALS['cache_instance']->init();