mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-08 17:56:52 +02:00
Code Issues Releases Wiki Activity

Un-b0rked ACL options caching, small general fixes

Browse Source 
git-svn-id: file:///svn/phpbb/trunk@3338 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Ludovic Arnaud
2003-01-20 05:12:38 +00:00
parent b2721cca0c
commit 458b9b50ec
15 changed files with 85 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
phpBB/includes/functions_display.php
View File

@@ -19,13 +19,21 @@
*
***************************************************************************/
function display_forums($root_data=array(), $display_moderators=TRUE)
function display_forums($root_data = '', $display_moderators = TRUE)
{
global $db, $template, $auth, $user, $phpEx, $SID, $forum_moderators;
$where_sql = ($root_data['forum_id']) ? ' WHERE left_id > ' . $root_data['left_id'] . ' AND left_id < ' . $root_data['right_id'] : '';
if (!$root_data)
{
$root_data = array('forum_id' => 0);
$where_sql = '';
}
else
{
$where_sql = ' WHERE left_id > ' . $root_data['left_id'] . ' AND left_id < ' . $root_data['right_id'];
}
if($user->data['user_id'] != ANONYMOUS)
if ($user->data['user_id'] != ANONYMOUS)
{
$lastread_select = ", lr.lastread_time";
$lastread_sql = "
@@ -34,8 +42,8 @@ function display_forums($root_data=array(), $display_moderators=TRUE)
AND (f.forum_id = lr.forum_id OR f.forum_id = -lr.forum_id)
AND lr.lastread_time >= f.forum_last_post_time)";
// Temp fix
$where_sql .= ' GROUP BY f.forum_id';
// Temp fix for index
//$where_sql .= ' GROUP BY f.forum_id';
}
else
{
@@ -230,4 +238,4 @@ function display_forums($root_data=array(), $display_moderators=TRUE)
));
}
}
?>
?>