[Phpbb-checkins] r10149 - /branches/phpBB-3_0_0/phpBB/includes/functions.php

[Meik S. <acy...@ph...>]

Author: acydburn
Date: Wed Sep 16 08:51:26 2009
New Revision: 10149

Log:
move up the feed code because MODs often use this location which results in more unneccessary conflicts.

Modified:
    branches/phpBB-3_0_0/phpBB/includes/functions.php

Modified: branches/phpBB-3_0_0/phpBB/includes/functions.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/functions.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/functions.php Wed Sep 16 08:51:26 2009
***************
*** 4035,4050 ****
  		}
  	}
  
- 	// 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);
  
--- 4035,4040 ----
***************
*** 4065,4070 ****
--- 4055,4070 ----
  	$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'],