From: millette <millette@controlyourself.ca>
Date: Fri, 14 Nov 2008 19:54:57 +0000 (-0500)
Subject: escaping was not needed at all to process short urls. Real fix.
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=0275676931883841bfdc7ffa8779e809f9d39fd3;p=quix0rs-gnu-social.git

escaping was not needed at all to process short urls. Real fix.

darcs-hash:20081114195457-099f7-45f4f39d5f2eff980d903ca156170576323ec4a7.gz
---

diff --git a/lib/util.php b/lib/util.php
index be391c7859..6f6d615e5c 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -761,12 +761,10 @@ function common_longurl($uri)  {
 }
 
 function common_shorten_links($text) {
-	$r = htmlspecialchars($text, ENT_NOQUOTES, 'UTF-8');
     // \s = not a horizontal whitespace character (since PHP 5.2.4)
 	// RYM this should prevent * preceded URLs from being processed but it its a char
 //	$r = preg_replace('@[^*](https?://[^)\]>\s]+)@e', "common_shorten_link('\\1')", $r);
-	$r = preg_replace('@https?://[^)\]>\s]+@e', "common_shorten_link('\\0')", $r);
-	return $r;
+	return preg_replace('@https?://[^)\]>\s]+@e', "common_shorten_link('\\0')", $text);
 }
 
 function common_shorten_link($long_url) {