[Phpbb-checkins] r10029 - in /branches/phpBB-3_0_0/phpBB: includes/functions_display.php viewforum.php

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

Author: acydburn
Date: Thu Aug 20 13:19:48 2009
New Revision: 10029

Log:
instead of only enabling forum feeds in viewforum we set it on every location where forums are shown

Modified:
    branches/phpBB-3_0_0/phpBB/includes/functions_display.php
    branches/phpBB-3_0_0/phpBB/viewforum.php

Modified: branches/phpBB-3_0_0/phpBB/includes/functions_display.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/functions_display.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/functions_display.php Thu Aug 20 13:19:48 2009
***************
*** 545,551 ****
  */
  function generate_forum_nav(&$forum_data)
  {
! 	global $db, $user, $template, $auth;
  	global $phpEx, $phpbb_root_path;
  
  	if (!$auth->acl_get('f_list', $forum_data['forum_id']))
--- 545,551 ----
  */
  function generate_forum_nav(&$forum_data)
  {
! 	global $db, $user, $template, $auth, $config;
  	global $phpEx, $phpbb_root_path;
  
  	if (!$auth->acl_get('f_list', $forum_data['forum_id']))
***************
*** 592,599 ****
  	$template->assign_vars(array(
  		'FORUM_ID' 		=> $forum_data['forum_id'],
  		'FORUM_NAME'	=> $forum_data['forum_name'],
! 		'FORUM_DESC'	=> generate_text_for_display($forum_data['forum_desc'], $forum_data['forum_desc_uid'], $forum_data['forum_desc_bitfield'], $forum_data['forum_desc_options']))
! 	);
  
  	return;
  }
--- 592,601 ----
  	$template->assign_vars(array(
  		'FORUM_ID' 		=> $forum_data['forum_id'],
  		'FORUM_NAME'	=> $forum_data['forum_name'],
! 		'FORUM_DESC'	=> generate_text_for_display($forum_data['forum_desc'], $forum_data['forum_desc_uid'], $forum_data['forum_desc_bitfield'], $forum_data['forum_desc_options']),
! 
! 		'S_ENABLE_FEEDS_FORUM'	=> ($config['feed_forum'] && !phpbb_optionget(FORUM_OPTION_FEED_EXCLUDE, $forum_data['forum_options'])) ? true : false,
! 	));
  
  	return;
  }

Modified: branches/phpBB-3_0_0/phpBB/viewforum.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/viewforum.php (original)
--- branches/phpBB-3_0_0/phpBB/viewforum.php Thu Aug 20 13:19:48 2009
***************
*** 310,316 ****
  	'S_SINGLE_MODERATOR'	=> (!empty($moderators[$forum_id]) && sizeof($moderators[$forum_id]) > 1) ? false : true,
  	'S_IS_LOCKED'			=> ($forum_data['forum_status'] == ITEM_LOCKED) ? true : false,
  	'S_VIEWFORUM'			=> true,
- 	'S_ENABLE_FEEDS_FORUM'	=> ($config['feed_forum'] && !phpbb_optionget(FORUM_OPTION_FEED_EXCLUDE, $forum_data['forum_options'])) ? true : false,
  
  	'U_MCP'				=> ($auth->acl_get('m_', $forum_id)) ? append_sid("{$phpbb_root_path}mcp.$phpEx", "f=$forum_id&i=main&mode=forum_view", true, $user->session_id) : '',
  	'U_POST_NEW_TOPIC'	=> ($auth->acl_get('f_post', $forum_id) || $user->data['user_id'] == ANONYMOUS) ? append_sid("{$phpbb_root_path}posting.$phpEx", 'mode=post&f=' . $forum_id) : '',
--- 310,315 ----