diff options
| author | Ludovic Arnaud <ludovic_arnaud@users.sourceforge.net> | 2003-01-20 05:12:38 +0000 |
|---|---|---|
| committer | Ludovic Arnaud <ludovic_arnaud@users.sourceforge.net> | 2003-01-20 05:12:38 +0000 |
| commit | 458b9b50ec8d835b4c5f72823d4815a9cee6d706 (patch) | |
| tree | ab0ea84c5e34cb6b5fa61b736e89722a92395c16 /phpBB/includes/functions_display.php | |
| parent | b2721cca0c82400efbf23abca1cbe260d4ea0eea (diff) | |
| download | forums-458b9b50ec8d835b4c5f72823d4815a9cee6d706.tar forums-458b9b50ec8d835b4c5f72823d4815a9cee6d706.tar.gz forums-458b9b50ec8d835b4c5f72823d4815a9cee6d706.tar.bz2 forums-458b9b50ec8d835b4c5f72823d4815a9cee6d706.tar.xz forums-458b9b50ec8d835b4c5f72823d4815a9cee6d706.zip | |
Un-b0rked ACL options caching, small general fixes
git-svn-id: file:///svn/phpbb/trunk@3338 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions_display.php')
| -rw-r--r-- | phpBB/includes/functions_display.php | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php index 297c52b95e..0f8e1ef4f4 100644 --- a/phpBB/includes/functions_display.php +++ b/phpBB/includes/functions_display.php @@ -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) )); } } -?> +?>
\ No newline at end of file |