Fix for broken cache handling in lib-mysql3.php, debug lines added

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

diff --git a/inc/loader/load_cache-modules.php b/inc/loader/load_cache-modules.php
index f0f48d8326f287e9dd43f5d0977ac4ee9ed62aa4..64a99d3f8bb9f82fcf6446952396e1679edc7aab 100644 (file)
--- a/inc/loader/load_cache-modules.php
+++ b/inc/loader/load_cache-modules.php
@@ -14,8 +14,6 @@
  * $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                    *
@@ -65,7 +63,7 @@ if (($GLOBALS['cache_instance']->loadCacheFile('modules')) && ($GLOBALS['cache_i
                $entries = array('id','title','locked','hidden','admin_only','mem_only');
 
                // Is ext-sql_patches newer or equal 0.3.6?
-               if ((isExtensionInstalled('sql_patches')) && (getExtensionVersion('sql_patches') >= '0.3.6')) {
+               if (isExtensionInstalledAndNewer('sql_patches', '0.3.6')) {
                        // Add 'has_menu'
                        $entries[] = 'has_menu';
                } // END - if
@@ -86,7 +84,7 @@ if (($GLOBALS['cache_instance']->loadCacheFile('modules')) && ($GLOBALS['cache_i
                } // END - foreach
        } // END - foreach
        unset($modArray);
-} elseif (getScriptOutputMode() != 1) {
+} elseif (isHtmlOutputMode()) {
        // Create cache file here
        $GLOBALS['cache_instance']->init();