diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2009-09-16 07:51:26 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2009-09-16 07:51:26 +0000 |
| commit | b27e96cf62399013646439ff352ebbc558e1e2c6 (patch) | |
| tree | ab702f9e52d715070373fe975da1bf293ecdb1c2 | |
| parent | c616b2b3368bc72e8b7d83bda2fabfbccb9099e5 (diff) | |
| download | forums-b27e96cf62399013646439ff352ebbc558e1e2c6.tar forums-b27e96cf62399013646439ff352ebbc558e1e2c6.tar.gz forums-b27e96cf62399013646439ff352ebbc558e1e2c6.tar.bz2 forums-b27e96cf62399013646439ff352ebbc558e1e2c6.tar.xz forums-b27e96cf62399013646439ff352ebbc558e1e2c6.zip | |
move up the feed code because MODs often use this location which results in more unneccessary conflicts.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10149 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/includes/functions.php | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 310bf903c1..747b624548 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -4035,16 +4035,6 @@ function page_header($page_title = '', $display_online_list = true, $item_id = 0 } } - // Which timezone? - $tz = ($user->data['user_id'] != ANONYMOUS) ? strval(doubleval($user->data['user_timezone'])) : strval(doubleval($config['board_timezone'])); - - // Send a proper content-language to the output - $user_lang = $user->lang['USER_LANG']; - if (strpos($user_lang, '-x-') !== false) - { - $user_lang = substr($user_lang, 0, strpos($user_lang, '-x-')); - } - $forum_id = request_var('f', 0); $topic_id = request_var('t', 0); @@ -4065,6 +4055,16 @@ function page_header($page_title = '', $display_online_list = true, $item_id = 0 $board_url = generate_board_url() . '/'; $web_path = (defined('PHPBB_USE_BOARD_URL_PATH') && PHPBB_USE_BOARD_URL_PATH) ? $board_url : $phpbb_root_path; + // Which timezone? + $tz = ($user->data['user_id'] != ANONYMOUS) ? strval(doubleval($user->data['user_timezone'])) : strval(doubleval($config['board_timezone'])); + + // Send a proper content-language to the output + $user_lang = $user->lang['USER_LANG']; + if (strpos($user_lang, '-x-') !== false) + { + $user_lang = substr($user_lang, 0, strpos($user_lang, '-x-')); + } + // The following assigns all _common_ variables that may be used at any point in a template. $template->assign_vars(array( 'SITENAME' => $config['sitename'], |