diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2009-01-20 16:54:15 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2009-01-20 16:54:15 +0000 |
| commit | cd4091af43fa2d7d3dbe5ad0d583c63f1d96c903 (patch) | |
| tree | b60c6980ad85e4a8daf48a10c3ab9e2efa4f29c2 /phpBB/common.php | |
| parent | b55f9854e770ba7c37e0e1914c8570c856cbecf3 (diff) | |
| download | forums-cd4091af43fa2d7d3dbe5ad0d583c63f1d96c903.tar forums-cd4091af43fa2d7d3dbe5ad0d583c63f1d96c903.tar.gz forums-cd4091af43fa2d7d3dbe5ad0d583c63f1d96c903.tar.bz2 forums-cd4091af43fa2d7d3dbe5ad0d583c63f1d96c903.tar.xz forums-cd4091af43fa2d7d3dbe5ad0d583c63f1d96c903.zip | |
i am not sure if people will like the config layout i test here... it requires the framework at least being present
git-svn-id: file:///svn/phpbb/trunk@9281 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/common.php')
| -rw-r--r-- | phpBB/common.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/phpBB/common.php b/phpBB/common.php index b0db9ad5b2..aa72b83612 100644 --- a/phpBB/common.php +++ b/phpBB/common.php @@ -22,7 +22,7 @@ if (!defined('IN_PHPBB')) require PHPBB_ROOT_PATH . 'includes/core/bootstrap.' . PHP_EXT; // Run through remaining Framework states -if (defined('PHPBB_CONFIG_MISSING') || !defined('PHPBB_INSTALLED')) +if (!phpbb::$base_config['config_set'] || !phpbb::$base_config['installed']) { // Redirect the user to the installer // We have to generate a full HTTP/1.1 header here since we can't guarantee to have any of the information @@ -66,16 +66,16 @@ phpbb_request::disable_super_globals(); // @todo Syndicate config variables somehow and check them here. It would be also nice to not have so many global vars from the config file (means: re-think layout of config file, maybe require phpbb:: to be set) -if (!empty($dbms)) +if (!empty(phpbb::$base_config['dbms'])) { // Register DB object. - phpbb::assign('db', phpbb_db_dbal::connect($dbms, $dbhost, $dbuser, $dbpasswd, $dbname, $dbport, false, defined('PHPBB_DB_NEW_LINK') ? PHPBB_DB_NEW_LINK : false)); + phpbb::assign('db', phpbb_db_dbal::connect(phpbb::$base_config['dbms'], phpbb::$base_config['dbhost'], phpbb::$base_config['dbuser'], phpbb::$base_config['dbpasswd'], phpbb::$base_config['dbname'], phpbb::$base_config['dbport'], false, defined('PHPBB_DB_NEW_LINK') ? PHPBB_DB_NEW_LINK : false)); } // We do not need the db password any longer, unset for safety purposes -if (!empty($dbpasswd)) +if (!empty(phpbb::$base_config['dbpasswd'])) { - unset($dbpasswd); + unset(phpbb::$base_config['dbpasswd']); } // Register Cache Manager |