[Phpbb-checkins] CVS: phpBB2/includes functions.php,1.133.2.4,1.133.2.5

[Paul S. O. <ps...@us...>]

Update of /cvsroot/phpbb/phpBB2/includes
In directory usw-pr-cvs1:/tmp/cvs-serv32590/includes

Modified Files:
      Tag: phpBB-2_0_0
	functions.php 
Log Message:
We don't run is_auth here because it adds another query ... as per several previous discussions ... please run any query adding changes through the development forum first, ta muchly.

Index: functions.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/functions.php,v
retrieving revision 1.133.2.4
retrieving revision 1.133.2.5
diff -C2 -r1.133.2.4 -r1.133.2.5
*** functions.php	8 Jul 2002 06:09:11 -0000	1.133.2.4
--- functions.php	8 Jul 2002 10:30:41 -0000	1.133.2.5
***************
*** 93,99 ****
  function make_jumpbox($action, $match_forum_id = 0)
  {
! 	global $template, $lang, $db, $userdata, $SID, $nav_links, $phpEx;
! 	
! 	$is_auth = auth(AUTH_VIEW, AUTH_LIST_ALL, $userdata);
  
  	$sql = "SELECT c.cat_id, c.cat_title, c.cat_order
--- 93,99 ----
  function make_jumpbox($action, $match_forum_id = 0)
  {
! 	global $template, $lang, $db, $SID, $nav_links, $phpEx;
! 
! //	$is_auth = auth(AUTH_VIEW, AUTH_LIST_ALL, $userdata);
  
  	$sql = "SELECT c.cat_id, c.cat_title, c.cat_order
***************
*** 138,143 ****
  				for($j = 0; $j < $total_forums; $j++)
  				{
! 					if ( $forum_rows[$j]['cat_id'] == $category_rows[$i]['cat_id'] && $is_auth[$forum_rows[$j]['forum_id']]['auth_view'] )
  					{
  						$selected = ( $forum_rows[$j]['forum_id'] == $match_forum_id ) ? 'selected="selected"' : '';
  						$boxstring_forums .=  '<option value="' . $forum_rows[$j]['forum_id'] . '"' . $selected . '>' . $forum_rows[$j]['forum_name'] . '</option>';
--- 138,146 ----
  				for($j = 0; $j < $total_forums; $j++)
  				{
! 					if ( $forum_rows[$j]['cat_id'] == $category_rows[$i]['cat_id'] && $forum_rows[$j]['auth_view'] <= AUTH_REG )
  					{
+ 
+ //					if ( $forum_rows[$j]['cat_id'] == $category_rows[$i]['cat_id'] && $is_auth[$forum_rows[$j]['forum_id']]['auth_view'] )
+ //					{
  						$selected = ( $forum_rows[$j]['forum_id'] == $match_forum_id ) ? 'selected="selected"' : '';
  						$boxstring_forums .=  '<option value="' . $forum_rows[$j]['forum_id'] . '"' . $selected . '>' . $forum_rows[$j]['forum_name'] . '</option>';