[ticket/11481] Move prepended slash from calls into function

PHPBB3-11481
This commit is contained in:
Joas Schilling 2013-06-06 20:35:38 +02:00
parent 6333451455
commit e36deed24f
6 changed files with 6 additions and 6 deletions

View file

@ -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'],

View file

@ -254,6 +254,6 @@ abstract class phpbb_feed_base
return $this->user->lang['GUEST'];
}
return '<a href="' . $this->helper->append_sid('/memberlist.' . $this->phpEx, 'mode=viewprofile&amp;u=' . $author_id) . '">' . $row[$this->get('creator')] . '</a>';
return '<a href="' . $this->helper->append_sid('memberlist.' . $this->phpEx, 'mode=viewprofile&amp;u=' . $author_id) . '">' . $row[$this->get('creator')] . '</a>';
}
}

View file

@ -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'])
{

View file

@ -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, '');
}
/**

View file

@ -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']}&amp;p={$row['post_id']}#p{$row['post_id']}");
$item_row['link'] = $this->helper->append_sid('viewtopic.' . $this->phpEx, "t={$row['topic_id']}&amp;p={$row['post_id']}#p{$row['post_id']}");
if ($this->config['feed_item_statistics'])
{

View file

@ -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'] . '&amp;p=' . $row['post_id'] . '#p' . $row['post_id']);
$item_row['link'] = $this->helper->append_sid('viewtopic.' . $this->phpEx, 't=' . $row['topic_id'] . '&amp;p=' . $row['post_id'] . '#p' . $row['post_id']);
if ($this->config['feed_item_statistics'])
{