From 6e72987a9241a1ea1b9d91b06bbf819ba2de0eaf Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Mon, 23 Aug 2010 10:43:00 +0000
Subject: [PATCH] Fixes for broken installation

---
 DOCS/TODOs.txt            | 1 +
 inc/mysql-connect.php     | 7 ++-----
 inc/wrapper-functions.php | 6 +++---
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/DOCS/TODOs.txt b/DOCS/TODOs.txt
index 9b949e3456..21a0837eb8 100644
--- 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 076faa56f2..70a3ef45b9 100644
--- 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 58f557f9a8..de57eb8b26 100644
--- 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
-- 
2.39.2