[Phpbb-checkins] r9868 - /branches/phpBB-3_0_0/phpBB/feed.php

[Meik S. <acy...@ph...>]

Author: acydburn
Date: Mon Jul 27 11:46:56 2009
New Revision: 9868

Log:
i hope this resolves the duplicate issues in feed readers

Modified:
    branches/phpBB-3_0_0/phpBB/feed.php

Modified: branches/phpBB-3_0_0/phpBB/feed.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/feed.php (original)
--- branches/phpBB-3_0_0/phpBB/feed.php Mon Jul 27 11:46:56 2009
***************
*** 218,227 ****
  	$link = (strpos($link, 'sid=') !== false) ? trim(preg_replace('/(&|&|\?)sid=[a-z0-9]+(&|&)?/', '\1', $link), '?& ') : $link;
  
  	// Now the only thing remaining could be an empty &
! 	if (substr($link, -5) === '&')
! 	{
! 		$link = substr($link, 0, -5);
! 	}
  
  	return $link;
  }
--- 218,226 ----
  	$link = (strpos($link, 'sid=') !== false) ? trim(preg_replace('/(&|&|\?)sid=[a-z0-9]+(&|&)?/', '\1', $link), '?& ') : $link;
  
  	// Now the only thing remaining could be an empty &
! 	$link = (substr($link, -5) === '&') ? substr($link, 0, -5) : $link;
! 	// And &#xxx
! 	$link = str_replace('&#', '#', $link);
  
  	return $link;
  }