X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmysql-connect.php;h=4ad7d8b2670a5f9d6991ee750ccf94f816089ba4;hp=8619a8510926b6439da01c74ad2093d1f9fd4cbf;hb=d9f35786166902b9bc3f402d4f2abeed5ae0528d;hpb=5a8c537bc2633402ca515964c9a3a2674f37edc2 diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php index 8619a85109..4ad7d8b267 100644 --- a/inc/mysql-connect.php +++ b/inc/mysql-connect.php @@ -18,6 +18,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 * @@ -42,7 +43,7 @@ if (!defined('__SECURITY')) { } // END - if // Load more function libraries or includes -foreach (array('functions', 'request-functions', 'session-functions', 'code-functions', 'language-functions', 'sql-functions', 'filter-functions', 'filters', 'mysql-manager', 'extensions-functions', 'handler') as $lib) { +foreach (array('request-functions', 'session-functions', 'code-functions', 'language-functions', 'sql-functions', 'expression-functions', 'filter-functions','revision-functions', 'filters', 'mysql-manager', 'extensions-functions', 'handler') as $lib) { // Load special functions loadIncludeOnce('inc/' . $lib . '.php'); } // END - foreach @@ -102,9 +103,6 @@ if ((!isInstalling()) && (!isInstallationPhase())) { // Load cache loadIncludeOnce('inc/load_cache.php'); - // Run the init filter chain - runFilterChain('init'); - // Check module for permissions $checkModule = checkModulePermissions(); @@ -148,28 +146,22 @@ if ((!isInstalling()) && (!isInstallationPhase())) { setConfigEntry('_DB_TYPE', 'mysql3'); // Include more - foreach (array('inc/databases.php','inc/versions.php','inc/db/lib.php','inc/session.php','inc/install-functions.php','inc/load_config.php') as $inc) { + foreach (array('inc/db/lib.php','inc/databases.php','inc/session.php','inc/versions.php','inc/install-functions.php','inc/load_config.php') as $inc) { // Load the include loadIncludeOnce($inc); } // END - foreach - // Load config - loadIncludeOnce('inc/load_config.php'); + // Load cache + loadIncludeOnce('inc/load_cache.php'); - // Init filter system here - initFilterSystem(); + // Run the init filter chain + runFilterChain('init'); // Are we installation routine? if ((!isInstalling()) && (getOutputMode() != 1) && (getOutputMode() != -1)) { // You have to install first! redirectToUrl('install.php'); } // END - if - - // Load cache - loadIncludeOnce('inc/load_cache.php'); - - // Run the init filter chain - runFilterChain('init'); } // Handle fatal errors