More fixes for extension loader / broken cache files

[mailer.git] / inc / load_extensions.php

diff --git a/inc/load_extensions.php b/inc/load_extensions.php
index bdfa0578e2f59063ee5b31c7166ad1c9413fb734..166aab7a833bb21a3ff1f05edb52a02c888c4832 100644 (file)
--- a/inc/load_extensions.php
+++ b/inc/load_extensions.php
@@ -51,6 +51,9 @@ $cacheArray['active_extensions'] = array();
 // By default no cache is set
 $cacheMode = "no";
 
+// Load sql_patchrs extension alone
+LOAD_EXTENSION("sql_patches");
+
 //
 // Load extensions
 //
@@ -102,7 +105,7 @@ if ($cacheMode == "load") {
                if ($EXT_DUMMY['ext_css'][$k] == "Y") $EXT_CSS_FILES[] = "".$name.".css";
 
                // Load extension file itself
-               if (($EXT_DUMMY['ext_active'][$k] == "Y") || ($EXT_DUMMY['ext_keep'][$k] == "Y") || (IS_ADMIN())) {
+               if ((($EXT_DUMMY['ext_active'][$k] == "Y") || ($EXT_DUMMY['ext_keep'][$k] == "Y") || (IS_ADMIN())) && (!in_array($name, array("sql_patches", "cache")))) {
                        $EXT_POOL[] = $name;
                } // END - if
 
@@ -205,7 +208,7 @@ if ((SQL_NUMROWS($res_ext_crt) > 0) && ((($cacheMode == "init") && ($CSS != "1")
                        $EXT_ALWAYS_ACTIVE = "N";
 
                        // Load extension
-                       if (($content['ext_name'] != "sql_patches") && (($content['ext_name'] == "cache") || (!EXT_IS_ACTIVE("cache")))) {
+                       if (($content['ext_name'] != "sql_patches") && (($content['ext_name'] != "cache") || (!EXT_IS_ACTIVE("cache")))) {
                                // Load extension
                                LOAD_EXTENSION($content['ext_name']);
                        } else {