More globals rewritten, see #100

[mailer.git] / inc / load_extensions.php

diff --git a/inc/load_extensions.php b/inc/load_extensions.php
index c3d2574d795659a6f0b006496f694a9f6f27fce5..67d43e2e0b3bbaa04994d0130cece0995532a73a 100644 (file)
--- a/inc/load_extensions.php
+++ b/inc/load_extensions.php
@@ -38,8 +38,7 @@ if (!defined('__SECURITY')) {
 }
 
 // Init variables
-global $EXT_CSS_FILES;
-$EXT_CSS_FILES = array();
+EXT_INIT_CSS_FILES();
 $ADD = "";
 
 // Init cache instance and array
@@ -107,7 +106,7 @@ if ($GLOBALS['cacheMode'] == "load") {
        $EXT_NAMES = array();
        foreach ($EXT_DUMMY['ext_name'] as $k => $name) {
                // Load CSS file
-               if ($EXT_DUMMY['ext_css'][$k] == "Y") $EXT_CSS_FILES[] = "".$name.".css";
+               if ($EXT_DUMMY['ext_css'][$k] == "Y") EXT_ADD_CSS_FILE("".$name.".css");
 
                // Load extension file itself
                if ((($EXT_DUMMY['ext_active'][$k] == "Y") || ($EXT_DUMMY['ext_keep'][$k] == "Y") || (IS_ADMIN())) && (!in_array($name, array("sql_patches", "cache")))) {
@@ -234,7 +233,7 @@ if ((SQL_NUMROWS($res_ext_crt) > 0) && ((($GLOBALS['cacheMode'] == "init") && ($
                                // Is the file there?
                                if (FILE_READABLE($GLOBALS['output_mode']_FILE)) {
                                        // CSS file for extension was found (use only relative path for now!)
-                                       $EXT_CSS_FILES[] = $content['ext_name'].".css";
+                                       EXT_ADD_CSS_FILE($content['ext_name'].".css");
                                        $content['ext_css'] = "Y";
                                } else {
                                        // Don't load CSS file