diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2012-10-17 22:35:36 -0400 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2012-10-17 22:35:36 -0400 |
| commit | b283df8241c3d8fc5f2684e37d8a0f237df39c4f (patch) | |
| tree | 34eac57cd092c90b010da9146e383e70539af52b | |
| parent | bb09cd9c8e76ac3af848d09db8ea1928dab66158 (diff) | |
| download | forums-b283df8241c3d8fc5f2684e37d8a0f237df39c4f.tar forums-b283df8241c3d8fc5f2684e37d8a0f237df39c4f.tar.gz forums-b283df8241c3d8fc5f2684e37d8a0f237df39c4f.tar.bz2 forums-b283df8241c3d8fc5f2684e37d8a0f237df39c4f.tar.xz forums-b283df8241c3d8fc5f2684e37d8a0f237df39c4f.zip | |
[ticket/10848] Move include up.
PHPBB3-10848
| -rw-r--r-- | phpBB/common.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/common.php b/phpBB/common.php index 5849d48453..31ca746924 100644 --- a/phpBB/common.php +++ b/phpBB/common.php @@ -26,6 +26,8 @@ if (file_exists($phpbb_root_path . 'config.' . $phpEx)) if (!defined('PHPBB_INSTALLED')) { // Redirect the user to the installer + require($phpbb_root_path . 'includes/functions.' . $phpEx); + // We have to generate a full HTTP/1.1 header here since we can't guarantee to have any of the information // available as used by the redirect function $server_name = (!empty($_SERVER['HTTP_HOST'])) ? strtolower($_SERVER['HTTP_HOST']) : ((!empty($_SERVER['SERVER_NAME'])) ? $_SERVER['SERVER_NAME'] : getenv('SERVER_NAME')); @@ -44,7 +46,6 @@ if (!defined('PHPBB_INSTALLED')) // (could happen on some proxy setups and/or Windows servers) $script_path = preg_replace('#[\\\\/]{2,}#', '/', $script_path); // Eliminate . and .. from the path - require($phpbb_root_path . 'includes/functions.' . $phpEx); $script_path = phpbb_clean_path($script_path); $url = (($secure) ? 'https://' : 'http://') . $server_name; |