Fixes for broken installation

diff --git a/DOCS/TODOs.txt b/DOCS/TODOs.txt
index 9b949e3456d4405ed2ba0642dd9d732912d9a5d3..21a0837eb8eaa661e862955221888e5182537ea5 100644 (file)
--- a/DOCS/TODOs.txt
+++ b/DOCS/TODOs.txt
@@ -4,6 +4,7 @@
 ./beg.php:165:                 // @TODO Opps, what is missing here???
 ./birthday_confirm.php:95:             // @TODO Try to rewrite the following unset()
 ./inc/autopurge/purge-inact.php:57:    // @TODO Rewrite these if() blocks to a filter
+./inc/cache/config-local.php:126:// @TODO Rewrite the following three constants, somehow...
 ./inc/classes/cachesystem.class.php:474:       // @TODO Add support for more types which break in last else-block
 ./inc/config-functions.php:141:        // @TODO Make this all better... :-/
 ./inc/expression-functions.php:166:// @TODO FILTER_COMPILE_CONFIG does not handle call-back functions so we handle it here again

diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php
index 076faa56f2d88f519300a1c722deb7cc1e4eb066..70a3ef45b937a4b67ba104c3266a85d63b94f39b 100644 (file)
--- a/inc/mysql-connect.php
+++ b/inc/mysql-connect.php
@@ -145,13 +145,10 @@ if ((!isInstalling()) && (!isInstallationPhase())) {
        setConfigEntry('_DB_TYPE', 'mysql3');
 
        // Include more
-       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) {
+       foreach (array('db/lib','databases','session','versions','install-functions','load_config','load_cache') as $inc) {
                // Load the include
-               loadIncludeOnce($inc);
+               loadIncludeOnce('inc/' . $inc . '.php');
        } // END - foreach
-
-       // Load cache
-       loadIncludeOnce('inc/load_cache.php');
 }
 
 // Handle fatal errors

diff --git a/inc/wrapper-functions.php b/inc/wrapper-functions.php
index 58f557f9a88daf8b7526f59df5a506f383e96ca3..de57eb8b26d35ce49b57dc8c70d6d1f4af520d47 100644 (file)
--- a/inc/wrapper-functions.php
+++ b/inc/wrapper-functions.php
@@ -276,13 +276,13 @@ function detectServerName () {
 // Check wether we are installing
 function isInstalling () {
        // Determine wether we are installing
-       if (!isset($GLOBALS[__FUNCTION__])) {
+       if (!isset($GLOBALS['mailer_installing'])) {
                // Check URL (css.php/js.php need this)
-               $GLOBALS[__FUNCTION__] = isGetRequestParameterSet('installing');
+               $GLOBALS['mailer_installing'] = isGetRequestParameterSet('installing');
        } // END - if
 
        // Return result
-       return $GLOBALS[__FUNCTION__];
+       return $GLOBALS['mailer_installing'];
 }
 
 // Check wether this script is installed