diff options
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 1 | ||||
| -rw-r--r-- | phpBB/includes/functions_content.php | 10 | 
2 files changed, 10 insertions, 1 deletions
| diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 6b389b9f17..11f1dc319a 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -93,6 +93,7 @@  		<li>[Fix] Do not display COPPA group in memberlist find member dialog if COPPA disabled (Bug #37175)</li>  		<li>[Fix] Do not try to send jabber notifications if no jid entered (Bug #36775)</li>  		<li>[Fix] Only display special ranks to guests; no longer display normal ranks for guests (Bug #36735)</li> +		<li>[Fix] Properly treat punctuation marks after local urls (Bug #37055)</li>  	</ul>  	<a name="v302"></a><h3>1.ii. Changes since 3.0.2</h3> diff --git a/phpBB/includes/functions_content.php b/phpBB/includes/functions_content.php index 627e6a71cd..caa1b470d6 100644 --- a/phpBB/includes/functions_content.php +++ b/phpBB/includes/functions_content.php @@ -565,6 +565,14 @@ function make_clickable_callback($type, $whitespace, $url, $relative_url, $class  			{  				$url = substr($url, 0, -1);  			} +			// appends last_char to orig_url to retrieve real original url +			$orig_url = substr($orig_url, 0, -1); +		break; + +		// set last_char to empty here, so the variable can be used later to +		// check whether a character was removed +		default: +			$last_char = '';  		break;  	} @@ -583,7 +591,7 @@ function make_clickable_callback($type, $whitespace, $url, $relative_url, $class  			// don't touch it and let MAGIC_URL_FULL take care of it.  			if (!$relative_url)  			{ -				return $whitespace . $orig_url . '/'; // slash is taken away by relative url pattern +				return $whitespace . $orig_url . '/' . $last_char; // slash is taken away by relative url pattern  			}  		break; | 
