diff --git a/root/portal/block/announcements.php b/root/portal/block/announcements.php index c38504d9..62e4ce9a 100644 --- a/root/portal/block/announcements.php +++ b/root/portal/block/announcements.php @@ -129,7 +129,7 @@ else $real_forum_id = ( $forum_id == 0 ) ? $fetch_news['global_id']: $forum_id; - $read_full_url = (isset($_GET['ap'])) ? 'ap='. $start . '&announcement=#a' : 'announcement=#a'; + $read_full_url = (isset($_GET['ap'])) ? 'ap='. $start . '&announcement=' . $i . '#a' . $i : 'announcement=' . $i . '#a' . $i; $view_topic_url = append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'f=' . (($fetch_news[$i]['forum_id']) ? $fetch_news[$i]['forum_id'] : $forum_id) . '&t=' . $topic_id); if ( $portal_config['portal_announcements_archive'] ) { @@ -251,7 +251,7 @@ else $close_bracket = ' ]'; $read_full = $user->lang['BACK']; - $read_full_url = (isset($_GET['ap'])) ? append_sid("{$phpbb_root_path}portal.$phpEx", "ap=$start#a") : append_sid("{$phpbb_root_path}portal.$phpEx#a"); + $read_full_url = (isset($_GET['ap'])) ? append_sid("{$phpbb_root_path}portal.$phpEx", "ap=$start#a$i") : append_sid("{$phpbb_root_path}portal.$phpEx#a$i"); $view_topic_url = append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'f=' . (($fetch_news[$i]['forum_id']) ? $fetch_news[$i]['forum_id'] : $forum_id) . '&t=' . $topic_id); if ( $portal_config['portal_announcements_archive'] ) { diff --git a/root/portal/block/news.php b/root/portal/block/news.php index 436fab6f..5e731e8a 100644 --- a/root/portal/block/news.php +++ b/root/portal/block/news.php @@ -119,7 +119,7 @@ else $topic_tracking_info = get_complete_topic_tracking($forum_id, $topic_id, $global_announce_list = false); $unread_topic = (isset($topic_tracking_info[$topic_id]) && $fetch_news[$i]['topic_last_post_time'] > $topic_tracking_info[$topic_id]) ? true : false; - $read_full_url = (isset($_GET['np'])) ? 'np='. $start . '&news=#n' : 'news=#n' ; + $read_full_url = (isset($_GET['np'])) ? 'np='. $start . '&news=' . $i . '#n' . $i : 'news=' . $i . '#n' . $i; $view_topic_url = append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'f=' . (($fetch_news[$i]['forum_id']) ? $fetch_news[$i]['forum_id'] : $forum_id) . '&t=' . $topic_id); if ( $portal_config['portal_news_archive'] ) { @@ -237,7 +237,7 @@ else $close_bracket = ' ]'; $read_full = $user->lang['BACK']; - $read_full_url = (isset($_GET['np'])) ? append_sid("{$phpbb_root_path}portal.$phpEx", "np=$start#n") : append_sid("{$phpbb_root_path}portal.$phpEx#n"); + $read_full_url = (isset($_GET['np'])) ? append_sid("{$phpbb_root_path}portal.$phpEx", "np=$start#n$i") : append_sid("{$phpbb_root_path}portal.$phpEx#n$i"); $view_topic_url = append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'f=' . (($fetch_news[$i]['forum_id']) ? $fetch_news[$i]['forum_id'] : $forum_id) . '&t=' . $topic_id); if ( $portal_config['portal_news_archive'] ) { diff --git a/root/styles/prosilver/template/portal/block/announcements.html b/root/styles/prosilver/template/portal/block/announcements.html index 57985aa7..ab83082c 100644 --- a/root/styles/prosilver/template/portal/block/announcements.html +++ b/root/styles/prosilver/template/portal/block/announcements.html @@ -16,7 +16,7 @@
-

{NEWEST_POST_IMG}{READ_POST_IMG} {announcements_row.ATTACH_ICON_IMG} {L_POLL}: {announcements_row.TITLE}

+

{NEWEST_POST_IMG}{READ_POST_IMG} {announcements_row.ATTACH_ICON_IMG} {L_POLL}: {announcements_row.TITLE}

{announcements_row.PAGINATION}