Don't attempt to load configuration or count modules in installation phase

diff --git a/inc/config-functions.php b/inc/config-functions.php
index 41505b26dd2b17220a4ef6dd05aadb78f285361e..310fc6bae363d073db062de3c10cf1497e5ae6a7 100644 (file)
--- a/inc/config-functions.php
+++ b/inc/config-functions.php
@@ -372,6 +372,12 @@ function updateConfiguration ($entries, $values, $updateMode = '', $config = '0'
 
 // Filter for loading configuration
 function FILTER_LOAD_CONFIGURATION ($no = '0') {
+       // Is installation phase?
+       if (isInstallationPhase()) {
+               // Then don't load any configuration
+               return;
+       } // END - if
+
        // Is the value null, it comes from the 'init' filter chain
        if (is_null($no)) {
                $no = '0';

diff --git a/inc/filters.php b/inc/filters.php
index 91852a46c6b7eadf8ed599c70f34aca46bd36595..a4adfd44d64b46814d4b826f9896ab43d131a060 100644 (file)
--- a/inc/filters.php
+++ b/inc/filters.php
@@ -711,7 +711,7 @@ function FILTER_DETERMINE_WHAT_ACTION () {
                        // Is the module registered?
                        if (!isModuleRegistered(getRequestElement('module'))) {
                                // Is not a valid module
-                               redirectToUrl('index.php');
+                               redirectToUrl('modules.php?module=index');
                        } // END - if
 
                        // Is the request element set?
@@ -877,6 +877,12 @@ function FILTER_INIT_RANDOM_NUMBER () {
 
 // Update module counter
 function FILTER_COUNT_MODULE () {
+       // Is installation phase?
+       if (isInstallationPhase()) {
+               // Then don't count any modules
+               return;
+       } // END - if
+
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'getModule()=' . getModule() . ' - ENTERED!');
        // Do count all other modules but not accesses on CSS file css.php!
        SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_mod_reg` SET `clicks`=`clicks`+1 WHERE `module`='%s' LIMIT 1",

diff --git a/inc/template-functions.php b/inc/template-functions.php
index f296be7355dc7e9918f091c3a15b610d05eb574a..7bfe4b9ddda0b4d012fe98f5c6f9c9f122901fae 100644 (file)
--- a/inc/template-functions.php
+++ b/inc/template-functions.php
@@ -187,11 +187,8 @@ function compileFinalOutput () {
        // Do the final (general) compilation
        $GLOBALS['__output'] = doFinalCompilation($GLOBALS['__output']);
 
-       // Is the output mode not HTML?
-       if (!isHtmlOutputMode()) {
-               // Then remove entities
-               $GLOBALS['__output'] = compileUriCode($GLOBALS['__output']);
-       } // END - if
+       // Compile any other things out
+       $GLOBALS['__output'] = compileUriCode($GLOBALS['__output']);
 
        // Extension 'rewrite' installed?
        if ((isExtensionActive('rewrite')) && (!isCssOutputMode())) {
@@ -1381,7 +1378,7 @@ function compileUriCode ($code, $simple = TRUE) {
        } // END - if
 
        // Compile QUOT and other non-HTML codes
-       $code = str_replace($charsCompile['from'], $charsCompile['to'], decodeEntities($code));
+       $code = str_replace($charsCompile['from'], $charsCompile['to'], $code);
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'code=' . $code);
 
        // Return compiled code