diff --git a/phpBB/feed.php b/phpBB/feed.php index 38bb9de008..35cd7fda3f 100644 --- a/phpBB/feed.php +++ b/phpBB/feed.php @@ -129,7 +129,7 @@ if (!$feed_updated_time) // FEED_IMAGE is not used (atom) $global_vars = array_merge($global_vars, array( 'FEED_IMAGE' => '', - 'SELF_LINK' => $phpbb_feed_helper->append_sid('/feed.' . $phpEx, $params), + 'SELF_LINK' => $phpbb_feed_helper->append_sid('feed.' . $phpEx, $params), 'FEED_LINK' => $board_url . '/index.' . $phpEx, 'FEED_TITLE' => $config['sitename'], 'FEED_SUBTITLE' => $config['site_desc'], diff --git a/phpBB/includes/feed/base.php b/phpBB/includes/feed/base.php index c8015ab916..af28ee8dc8 100644 --- a/phpBB/includes/feed/base.php +++ b/phpBB/includes/feed/base.php @@ -254,6 +254,6 @@ abstract class phpbb_feed_base return $this->user->lang['GUEST']; } - return '' . $row[$this->get('creator')] . ''; + return '' . $row[$this->get('creator')] . ''; } } diff --git a/phpBB/includes/feed/forums.php b/phpBB/includes/feed/forums.php index 130da1c56a..72f786aa6a 100644 --- a/phpBB/includes/feed/forums.php +++ b/phpBB/includes/feed/forums.php @@ -61,7 +61,7 @@ class phpbb_feed_forums extends phpbb_feed_base function adjust_item(&$item_row, &$row) { - $item_row['link'] = $this->helper->append_sid('/viewforum.' . $this->phpEx, 'f=' . $row['forum_id']); + $item_row['link'] = $this->helper->append_sid('viewforum.' . $this->phpEx, 'f=' . $row['forum_id']); if ($this->config['feed_item_statistics']) { diff --git a/phpBB/includes/feed/helper.php b/phpBB/includes/feed/helper.php index 20a399bcd7..93330aa2ad 100644 --- a/phpBB/includes/feed/helper.php +++ b/phpBB/includes/feed/helper.php @@ -65,7 +65,7 @@ class phpbb_feed_helper */ public function append_sid($url, $params) { - return append_sid($this->get_board_url() . $url, $params, true, ''); + return append_sid($this->get_board_url() . '/' . $url, $params, true, ''); } /** diff --git a/phpBB/includes/feed/post_base.php b/phpBB/includes/feed/post_base.php index bfcb4141ec..a25ed50263 100644 --- a/phpBB/includes/feed/post_base.php +++ b/phpBB/includes/feed/post_base.php @@ -45,7 +45,7 @@ abstract class phpbb_feed_post_base extends phpbb_feed_base function adjust_item(&$item_row, &$row) { - $item_row['link'] = $this->helper->append_sid('/viewtopic.' . $this->phpEx, "t={$row['topic_id']}&p={$row['post_id']}#p{$row['post_id']}"); + $item_row['link'] = $this->helper->append_sid('viewtopic.' . $this->phpEx, "t={$row['topic_id']}&p={$row['post_id']}#p{$row['post_id']}"); if ($this->config['feed_item_statistics']) { diff --git a/phpBB/includes/feed/topic_base.php b/phpBB/includes/feed/topic_base.php index 0c845c30bd..e6a47b4c86 100644 --- a/phpBB/includes/feed/topic_base.php +++ b/phpBB/includes/feed/topic_base.php @@ -45,7 +45,7 @@ abstract class phpbb_feed_topic_base extends phpbb_feed_base function adjust_item(&$item_row, &$row) { - $item_row['link'] = $this->helper->append_sid('/viewtopic.' . $this->phpEx, 't=' . $row['topic_id'] . '&p=' . $row['post_id'] . '#p' . $row['post_id']); + $item_row['link'] = $this->helper->append_sid('viewtopic.' . $this->phpEx, 't=' . $row['topic_id'] . '&p=' . $row['post_id'] . '#p' . $row['post_id']); if ($this->config['feed_item_statistics']) {