diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2012-08-06 23:07:32 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2012-08-06 23:07:32 +0200 |
| commit | 8ce0a4eebd260a861d2f0055e393528a21b0bf5c (patch) | |
| tree | 124d33f9ed9abb1e6c83a4caff64b80f5e87bf18 | |
| parent | bdbc57e49ad4675c6f1a661db4ee10423ce2caa8 (diff) | |
| parent | a2dd99b75e308448c309ce4db807ea0091245443 (diff) | |
| download | forums-8ce0a4eebd260a861d2f0055e393528a21b0bf5c.tar forums-8ce0a4eebd260a861d2f0055e393528a21b0bf5c.tar.gz forums-8ce0a4eebd260a861d2f0055e393528a21b0bf5c.tar.bz2 forums-8ce0a4eebd260a861d2f0055e393528a21b0bf5c.tar.xz forums-8ce0a4eebd260a861d2f0055e393528a21b0bf5c.zip | |
Merge remote-tracking branch 'EXreaction/ticket/10885' into develop
* EXreaction/ticket/10885:
[ticket/10885] Fix UCP Main Error if no forums exist
| -rw-r--r-- | phpBB/includes/ucp/ucp_main.php | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/phpBB/includes/ucp/ucp_main.php b/phpBB/includes/ucp/ucp_main.php index f21ea2471b..94fd59433b 100644 --- a/phpBB/includes/ucp/ucp_main.php +++ b/phpBB/includes/ucp/ucp_main.php @@ -69,17 +69,16 @@ class ucp_main // Get cleaned up list... return only those forums having the f_read permission $forum_ary = $auth->acl_getf('f_read', true); $forum_ary = array_unique(array_keys($forum_ary)); - - $sql = "SELECT t.* $sql_select - FROM $sql_from - WHERE t.topic_type = " . POST_GLOBAL . ' - AND ' . $db->sql_in_set('t.forum_id', $forum_ary) . ' - ORDER BY t.topic_last_post_time DESC'; - $topic_list = $rowset = array(); + // If the user can't see any forums, he can't read any posts because fid of 0 is invalid if (!empty($forum_ary)) { + $sql = "SELECT t.* $sql_select + FROM $sql_from + WHERE t.topic_type = " . POST_GLOBAL . ' + AND ' . $db->sql_in_set('t.forum_id', $forum_ary) . ' + ORDER BY t.topic_last_post_time DESC'; $result = $db->sql_query($sql); while ($row = $db->sql_fetchrow($result)) @@ -671,7 +670,7 @@ class ucp_main if ($topics_count) { phpbb_generate_template_pagination($template, $this->u_action, 'pagination', 'start', $topics_count, $config['topics_per_page'], $start); - + $template->assign_vars(array( 'PAGE_NUMBER' => phpbb_on_page($template, $user, $this->u_action, $topics_count, $config['topics_per_page'], $start), 'TOTAL_TOPICS' => $user->lang('VIEW_FORUM_TOPICS', (int) $topics_count), @@ -837,7 +836,7 @@ class ucp_main 'U_VIEW_TOPIC' => $view_topic_url, 'U_VIEW_FORUM' => append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $forum_id), )); - + phpbb_generate_template_pagination($template, append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'f=' . $row['forum_id'] . "&t=$topic_id"), 'topicrow.pagination', 'start', $replies + 1, $config['posts_per_page'], 1, true, true); } } |