makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-07 20:08:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

- finally (re-)implement the fixes for bug #90 and #91. They were noted as fixed but got out of CVS due to another fix and has not been re-applied.

Browse source 
git-svn-id: file:///svn/phpbb/branches/phpBB-2_0_0@5502 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen 2006-01-28 11:13:39 +00:00
parent 5384eedd68
commit c2de464100
2 changed files with 20 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
phpBB/docs/CHANGELOG.html
View file

@ -71,6 +71,8 @@ p,ul,td {font-size:10pt;}
<li>[Fix] Prevent login attempts from incrementing for inactive users</li> <li>[Fix] Prevent login attempts from incrementing for inactive users</li>
<li>[Fix] Do not check maximum login attempts on re-authentication to the admin panel - tomknight</li> <li>[Fix] Do not check maximum login attempts on re-authentication to the admin panel - tomknight</li>
<li>[Fix] Regenerate session keys on password change</li> <li>[Fix] Regenerate session keys on password change</li>
<li>[Fix] retrieving category rows in index.php (Bug #90)</li>
<li>[Fix] improved index performance by determining the permissions before iterating through all forums (Bug #91)</li>
<li>[Fix] Better handling of short usernames within the search (bug #105)</li> <li>[Fix] Better handling of short usernames within the search (bug #105)</li>
<li>[Fix] Workaround for an issue in either PHP or MSSQL resulting in a space being returned instead of an empty string (bug #830)</li> <li>[Fix] Workaround for an issue in either PHP or MSSQL resulting in a space being returned instead of an empty string (bug #830)</li>
<li>[Fix] Correct use of default_style config value (Bug #861)</li> <li>[Fix] Correct use of default_style config value (Bug #861)</li>
@ -101,8 +103,6 @@ p,ul,td {font-size:10pt;}
<ul> <ul>
<li>[Fix] incorrect handling of password resets if admin activation is enabled (Bug #88)</li> <li>[Fix] incorrect handling of password resets if admin activation is enabled (Bug #88)</li>
<li>[Fix] retrieving category rows in index.php (Bug #90)</li>
<li>[Fix] improved index performance by determining the permissions before iterating through all forums (Bug #91)</li>
<li>[Fix] wrong topic redirection after login redirect (Bug #94)</li> <li>[Fix] wrong topic redirection after login redirect (Bug #94)</li>
<li>[Fix] improved handling of username lists in admin_ug_auth.php (Bug #98)</li> <li>[Fix] improved handling of username lists in admin_ug_auth.php (Bug #98)</li>
<li>[Fix] incorrect removal of bbcode_uid values if bbcode has been turned off (Bug #100)</li> <li>[Fix] incorrect removal of bbcode_uid values if bbcode has been turned off (Bug #100)</li>

32
phpBB/index.php
View file

@ -119,7 +119,10 @@ if( !($result = $db->sql_query($sql)) )
} }
$category_rows = array(); $category_rows = array();
while( $category_rows[] = $db->sql_fetchrow($result) ); while ($row = $db->sql_fetchrow($result))
{
$category_rows[] = $row;
}
$db->sql_freeresult($result); $db->sql_freeresult($result);
if( ( $total_categories = count($category_rows) ) ) if( ( $total_categories = count($category_rows) ) )
@ -299,6 +302,19 @@ if( ( $total_categories = count($category_rows) ) )
'U_MARK_READ' => append_sid("index.$phpEx?mark=forums")) 'U_MARK_READ' => append_sid("index.$phpEx?mark=forums"))
); );
//
// Let's decide which categories we should display
//
$display_categories = array();
for ($i = 0; $i < $total_forums; $i++ )
{
if ($is_auth_ary[$forum_data[$i]['forum_id']]['auth_view'])
{
$display_categories[$forum_data[$i]['cat_id']] = true;
}
}
// //
// Okay, let's build the index // Okay, let's build the index
// //
@ -306,23 +322,11 @@ if( ( $total_categories = count($category_rows) ) )
{ {
$cat_id = $category_rows[$i]['cat_id']; $cat_id = $category_rows[$i]['cat_id'];
//
// Should we display this category/forum set?
//
$display_forums = false;
for($j = 0; $j < $total_forums; $j++)
{
if ( $is_auth_ary[$forum_data[$j]['forum_id']]['auth_view'] && $forum_data[$j]['cat_id'] == $cat_id )
{
$display_forums = true;
}
}
// //
// Yes, we should, so first dump out the category // Yes, we should, so first dump out the category
// title, then, if appropriate the forum list // title, then, if appropriate the forum list
// //
if ( $display_forums ) if (isset($display_categories[$cat_id]) && $display_categories[$cat_id])
{ {
$template->assign_block_vars('catrow', array( $template->assign_block_vars('catrow', array(
'CAT_ID' => $cat_id, 'CAT_ID' => $cat_id,