diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2006-10-30 16:20:11 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2006-10-30 16:20:11 +0000 |
| commit | c44f6ca080c944b57dc912de8708e5239c1543a2 (patch) | |
| tree | 812e6cdb05ee83c0270f8d72d2e064adcb75064a /phpBB/viewforum.php | |
| parent | 7e55e53d10702a9d8af8a70685801aa486fab3dc (diff) | |
| download | forums-c44f6ca080c944b57dc912de8708e5239c1543a2.tar forums-c44f6ca080c944b57dc912de8708e5239c1543a2.tar.gz forums-c44f6ca080c944b57dc912de8708e5239c1543a2.tar.bz2 forums-c44f6ca080c944b57dc912de8708e5239c1543a2.tar.xz forums-c44f6ca080c944b57dc912de8708e5239c1543a2.zip | |
some fixes
git-svn-id: file:///svn/phpbb/trunk@6538 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/viewforum.php')
| -rw-r--r-- | phpBB/viewforum.php | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php index 3710bd9f50..c3b9d73a03 100644 --- a/phpBB/viewforum.php +++ b/phpBB/viewforum.php @@ -194,8 +194,6 @@ $limit_days = array(0 => $user->lang['ALL_TOPICS'], 1 => $user->lang['1_DAY'], 7 $sort_by_text = array('a' => $user->lang['AUTHOR'], 't' => $user->lang['POST_TIME'], 'r' => $user->lang['REPLIES'], 's' => $user->lang['SUBJECT'], 'v' => $user->lang['VIEWS']); $sort_by_sql = array('a' => 't.topic_first_poster_name', 't' => 't.topic_last_post_time', 'r' => 't.topic_replies', 's' => 't.topic_title', 'v' => 't.topic_views'); -$sort_key = (!in_array($sort_key, array('a', 't', 'r', 's', 'v'))) ? 't' : $sort_key; - $s_limit_days = $s_sort_key = $s_sort_dir = $u_sort_param = ''; gen_sort_selects($limit_days, $sort_by_text, $sort_days, $sort_key, $sort_dir, $s_limit_days, $s_sort_key, $s_sort_dir, $u_sort_param); @@ -225,15 +223,7 @@ if ($sort_days) } else { - if ($auth->acl_get('m_approve', $forum_id)) - { - $topics_count = ($forum_data['forum_topics_real']) ? $forum_data['forum_topics_real'] : 1; - } - else - { - $topics_count = ($forum_data['forum_topics']) ? $forum_data['forum_topics'] : 1; - } - + $topics_count = ($auth->acl_get('m_approve', $forum_id)) ? $forum_data['forum_topics_real'] : $forum_data['forum_topics']; $sql_limit_time = ''; } |