X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fload_extensions.php;h=975ffc393ecb60f04f2d78377cdd6dd76c093505;hb=e53891f4375882eba23d10df70d92bff167677a9;hp=ce1ea10e343459ff8bd9963baa07ac8276ba5154;hpb=508228c85fba8448d00865b1639cb8cd7a69e457;p=mailer.git diff --git a/inc/load_extensions.php b/inc/load_extensions.php index ce1ea10e34..975ffc393e 100644 --- a/inc/load_extensions.php +++ b/inc/load_extensions.php @@ -12,7 +12,7 @@ * -------------------------------------------------------------------- * * @TODO Rewrite this whole file to load_cache-extensions.php * * -------------------------------------------------------------------- * - * $Revision:: 856 $ * + * $Revision:: $ * * $Date:: $ * * $Tag:: 0.2.1-FINAL $ * * $Author:: $ * @@ -46,7 +46,7 @@ if (!defined('__SECURITY')) { // Init variables EXT_INIT_CSS_FILES(); -$ADD = ""; +$add = ""; // Init cache instance and array $GLOBALS['cache_instance'] = null; @@ -74,7 +74,7 @@ if (!LOAD_EXTENSION("sql_patches")) { } // END - if // Init inc pool array -$INC_POOL = array(); +INIT_INC_POOL(); // // Load extensions @@ -196,17 +196,17 @@ if ($GLOBALS['cache_mode'] == "load") { // If current user is not admin load only activated extensions. But load // them all if we are going to init the cache files. The admin shall use // every available extension for testing purposes. - if ((!IS_ADMIN()) && ($GLOBALS['cache_mode'] != "init")) $ADD = " WHERE ext_active='Y'"; + if ((!IS_ADMIN()) && ($GLOBALS['cache_mode'] != "init")) $add = " WHERE ext_active='Y'"; if (GET_EXT_VERSION("sql_patches") >= "0.0.6") { // Query with CSS file from DB $res_ext_crt = SQL_QUERY("SELECT id AS ext_id, ext_name, ext_has_css AS ext_css, ext_active, ext_version -FROM `{!_MYSQL_PREFIX!}_extensions`".$ADD." +FROM `{!_MYSQL_PREFIX!}_extensions`".$add." ORDER BY ext_name", __FILE__, __LINE__); } else { // Old obsolete query string $res_ext_crt = SQL_QUERY("SELECT id AS ext_id, ext_name, ext_name, ext_active, ext_version -FROM `{!_MYSQL_PREFIX!}_extensions`".$ADD." +FROM `{!_MYSQL_PREFIX!}_extensions`".$add." ORDER BY ext_name", __FILE__, __LINE__); } } @@ -293,7 +293,7 @@ if ((SQL_NUMROWS($res_ext_crt) > 0) && ((($GLOBALS['cache_mode'] == "init") && ( } // Run the filter -runFilterChain('load_includes', $INC_POOL); +runFilterChain('load_includes'); // Uninstall extensions that are no longer in our system if (!empty($DEL[0])) {