diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2009-01-16 17:57:28 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2009-01-16 17:57:28 +0000 |
| commit | 5a263f76a936dc6f1dba446b5ec1a1c3f5075a84 (patch) | |
| tree | 2c85ca4c18a2a9f2746a938eefd1b4f0d2f32ad5 /phpBB/install/install_update.php | |
| parent | bac6a3c0e286318715f1e388144afb2d5b348f53 (diff) | |
| download | forums-5a263f76a936dc6f1dba446b5ec1a1c3f5075a84.tar forums-5a263f76a936dc6f1dba446b5ec1a1c3f5075a84.tar.gz forums-5a263f76a936dc6f1dba446b5ec1a1c3f5075a84.tar.bz2 forums-5a263f76a936dc6f1dba446b5ec1a1c3f5075a84.tar.xz forums-5a263f76a936dc6f1dba446b5ec1a1c3f5075a84.zip | |
"are you serious?" - "yes, sure" - "wow, install works, you are right" - "i told you"
git-svn-id: file:///svn/phpbb/trunk@9277 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/install/install_update.php')
| -rw-r--r-- | phpBB/install/install_update.php | 30 |
1 files changed, 5 insertions, 25 deletions
diff --git a/phpBB/install/install_update.php b/phpBB/install/install_update.php index 4da795bb4b..d347c0af59 100644 --- a/phpBB/install/install_update.php +++ b/phpBB/install/install_update.php @@ -70,7 +70,7 @@ class install_update extends module function main($mode, $sub) { - global $template, $user, $db, $auth; + require PHPBB_ROOT_PATH . 'common.' . PHP_EXT; $this->tpl_name = 'install_update'; $this->page_title = 'UPDATE_INSTALLATION'; @@ -79,33 +79,13 @@ class install_update extends module $this->old_location = PHPBB_ROOT_PATH . 'install/update/old/'; $this->new_location = PHPBB_ROOT_PATH . 'install/update/new/'; - // Init DB - require(PHPBB_ROOT_PATH . 'config.' . PHP_EXT); - require(PHPBB_ROOT_PATH . 'includes/db/' . $dbms . '.' . PHP_EXT); - require(PHPBB_ROOT_PATH . 'includes/constants.' . PHP_EXT); - - // Special options for conflicts/modified files - define('MERGE_NO_MERGE_NEW', 1); - define('MERGE_NO_MERGE_MOD', 2); - define('MERGE_NEW_FILE', 3); - define('MERGE_MOD_FILE', 4); - - $db = new $sql_db(); - - // Connect to DB - $db->sql_connect($dbhost, $dbuser, $dbpasswd, $dbname, $dbport, false, false); - - // We do not need this any longer, unset for safety purposes - unset($dbpasswd); - // Force template recompile phpbb::$config['load_tplcompile'] = 1; - // First of all, init the user session - $user->session_begin(); - $auth->acl($user->data); - - $user->setup('install'); + // Start session management + phpbb::$user->session_begin(); + phpbb::$acl->init(phpbb::$user->data); + phpbb::$user->setup('viewforum'); // If we are within the intro page we need to make sure we get up-to-date version info if ($sub == 'intro') |