From 0afc55d5abecce1426bb478b13ba4049adc5d75b Mon Sep 17 00:00:00 2001 From: Kevin Date: Sat, 16 Aug 2008 15:52:29 +0000 Subject: [PATCH] Cleaning and changing back to $topic_order like Ice wants it to have :P --- root/portal/block/news.php | 1 - root/portal/includes/functions.php | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/root/portal/block/news.php b/root/portal/block/news.php index 9e7ca594..dd7dea4f 100644 --- a/root/portal/block/news.php +++ b/root/portal/block/news.php @@ -208,7 +208,6 @@ $fetch_news = phpbb_fetch_posts($portal_config['portal_news_forum'], $portal_con 'L_READ_FULL' => $read_full, 'OPEN' => $open_bracket, 'CLOSE' => $close_bracket, - 'S_TOPIC_ICONS' => ($s_display_active && sizeof($active_forum_ary)) ? max($active_forum_ary['enable_icons']) : (($forum_data['enable_icons']) ? true : false), 'S_NOT_LAST' => ($i < sizeof($fetch_news) - 1) ? true : false, 'S_POLL' => $fetch_news[$i]['poll'], 'S_UNREAD_INFO' => $unread_topic, diff --git a/root/portal/includes/functions.php b/root/portal/includes/functions.php index ea7f343f..ebef269f 100644 --- a/root/portal/includes/functions.php +++ b/root/portal/includes/functions.php @@ -136,7 +136,7 @@ function phpbb_fetch_posts($forum_from, $permissions, $number_of_posts, $text_le $str_where = ( strlen($str_where) > 0 ) ? 'AND (' . trim(substr($str_where, 0, -4)) . ')' : ''; $user_link = ( $portal_config['portal_news_style'] ) ? 't.topic_poster = u.user_id' : (( $portal_config['portal_news_show_last'] ) ? 't.topic_last_poster_id = u.user_id' : 't.topic_poster = u.user_id' ) ; $post_link = ( $portal_config['portal_news_style'] ) ? 't.topic_first_post_id = p.post_id' : (( $portal_config['portal_news_show_last'] ) ? 't.topic_last_post_id = p.post_id' : 't.topic_first_post_id = p.post_id' ) ; - $topic_order = 't.topic_last_post_time DESC' ; + $topic_order = ( $portal_config['portal_news_show_last'] ) ? 't.topic_last_post_time DESC' : 't.topic_time DESC' ; break; @@ -146,7 +146,7 @@ function phpbb_fetch_posts($forum_from, $permissions, $number_of_posts, $text_le $str_where = ( strlen($str_where) > 0 ) ? 'AND (' . trim(substr($str_where, 0, -4)) . ')' : ''; $user_link = ( $portal_config['portal_news_style'] ) ? 't.topic_poster = u.user_id' : (( $portal_config['portal_news_show_last'] ) ? 't.topic_last_poster_id = u.user_id' : 't.topic_poster = u.user_id' ) ; $post_link = ( $portal_config['portal_news_style'] ) ? 't.topic_first_post_id = p.post_id' : (( $portal_config['portal_news_show_last'] ) ? 't.topic_last_post_id = p.post_id' : 't.topic_first_post_id = p.post_id' ) ; - $topic_order = 't.topic_last_post_time DESC' ; + $topic_order = ( $portal_config['portal_news_show_last'] ) ? 't.topic_last_post_time DESC' : 't.topic_time DESC' ; break; }