From dd9ad539fdab80badedf801a816b8a0beafbbf5c Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Tue, 6 Jun 2006 20:53:46 +0000
Subject: ok, this one is rather large... the most important change:
 re-introduce append_sid: old style continues to work, not a performance hog
 as it was in 2.0.x -> structure is different

apart from this, code cleanage, bug fixing, etc.


git-svn-id: file:///svn/phpbb/trunk@6015 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/common.php | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

(limited to 'phpBB/common.php')

diff --git a/phpBB/common.php b/phpBB/common.php
index 6164b8d714..66a40e022b 100644
--- a/phpBB/common.php
+++ b/phpBB/common.php
@@ -33,17 +33,17 @@ error_reporting(E_ALL ^ E_NOTICE);
 function deregister_globals()
 {
 	$not_unset = array(
-		'GLOBALS' => true,
-		'_GET' => true,
-		'_POST' => true,
-		'_COOKIE' => true,
-		'_REQUEST' => true,
-		'_SERVER' => true,
-		'_SESSION' => true,
-		'_ENV' => true,
-		'_FILES' => true,
-		'phpEx' => true,
-		'phpbb_root_path' => true
+		'GLOBALS'	=> true,
+		'_GET'		=> true,
+		'_POST'		=> true,
+		'_COOKIE'	=> true,
+		'_REQUEST'	=> true,
+		'_SERVER'	=> true,
+		'_SESSION'	=> true,
+		'_ENV'		=> true,
+		'_FILES'	=> true,
+		'phpEx'		=> true,
+		'phpbb_root_path'	=> true
 	);
 
 	// Not only will array_merge and array_keys give a warning if
@@ -54,8 +54,7 @@ function deregister_globals()
 		$_SESSION = array();
 	}
 
-	// Merge all into one extremely huge array; unset
-	// this later
+	// Merge all into one extremely huge array; unset this later
 	$input = array_merge(
 		array_keys($_GET),
 		array_keys($_POST),
@@ -107,11 +106,11 @@ if (defined('IN_CRON'))
 	$phpbb_root_path = getcwd() . '/';
 }
 
-require($phpbb_root_path . 'config.'.$phpEx);
+require($phpbb_root_path . 'config.' . $phpEx);
 
 if (!defined('PHPBB_INSTALLED'))
 {
-	header('Location: install/index.'.$phpEx);
+	redirect($phpbb_root_path . 'install/index.' . $phpEx);
 	exit;
 }
 
-- 
cgit v1.2.1