Wrapper functions introduced for configuration, loaders refactured:

[mailer.git] / inc / loader / load-config.php

diff --git a/inc/loader/load-config.php b/inc/loader/load-config.php
index 550f6028b276444beb1aee41fa0f0c6c89791f28..6c61f8ea2dfe67aaf5a197da2ba2c6945828d638 100644 (file)
--- a/inc/loader/load-config.php
+++ b/inc/loader/load-config.php
@@ -38,11 +38,11 @@
 // Some security stuff...
 if (!defined('__SECURITY')) {
        die();
 // Some security stuff...
 if (!defined('__SECURITY')) {
        die();

+} elseif (isInstallationPhase()) {
+       // Use this code if you don't want to run this cache loader on installation phase
+       return;

 }
 
 }
 

-// Use this code if you don't want to run this cache loader on installation phase
-if (isInstallationPhase()) return;
-

 // Next cached table is the configuration (config)...
 if (($GLOBALS['cache_instance']->loadCacheFile('config')) && ($GLOBALS['cache_instance']->extensionVersionMatches('sql_patches'))) {
        // Load config from cache
 // Next cached table is the configuration (config)...
 if (($GLOBALS['cache_instance']->loadCacheFile('config')) && ($GLOBALS['cache_instance']->extensionVersionMatches('sql_patches'))) {
        // Load config from cache