diff options
author | David King <imkingdavid@gmail.com> | 2012-03-28 16:48:16 -0400 |
---|---|---|
committer | David King <imkingdavid@gmail.com> | 2012-03-28 16:48:16 -0400 |
commit | 35805a27408f4d25987c3f8df5c9bf54b15a19f3 (patch) | |
tree | d9baad4b0c38c40a2b1b3838188d57c9c3206125 /phpBB | |
parent | c44d77b03148122dceb33c0bf30858013bbffd38 (diff) | |
download | forums-35805a27408f4d25987c3f8df5c9bf54b15a19f3.tar forums-35805a27408f4d25987c3f8df5c9bf54b15a19f3.tar.gz forums-35805a27408f4d25987c3f8df5c9bf54b15a19f3.tar.bz2 forums-35805a27408f4d25987c3f8df5c9bf54b15a19f3.tar.xz forums-35805a27408f4d25987c3f8df5c9bf54b15a19f3.zip |
[ticket/10586] Moved some loading stuff below extension controller, updated tests
PHPBB3-10586
Diffstat (limited to 'phpBB')
-rw-r--r-- | phpBB/index.php | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/phpBB/index.php b/phpBB/index.php index d71878a885..9a57105d57 100644 --- a/phpBB/index.php +++ b/phpBB/index.php @@ -17,12 +17,11 @@ define('IN_PHPBB', true); $phpbb_root_path = (defined('PHPBB_ROOT_PATH')) ? PHPBB_ROOT_PATH : './'; $phpEx = substr(strrchr(__FILE__, '.'), 1); include($phpbb_root_path . 'common.' . $phpEx); -include($phpbb_root_path . 'includes/functions_display.' . $phpEx); // Start session management $user->session_begin(); $auth->acl($user->data); -$user->setup('viewforum'); +$user->setup(); // Handle the display of extension front pages if ($ext = $request->variable('ext', '')) @@ -57,6 +56,10 @@ if ($ext = $request->variable('ext', '')) exit_handler(); } +include($phpbb_root_path . 'includes/functions_display.' . $phpEx); + +$user->add_lang('viewforum'); + display_forums('', $config['load_moderators']); $order_legend = ($config['legend_sort_groupname']) ? 'group_name' : 'group_legend'; |