summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authormillette <millette@controlyourself.ca>2008-11-13 12:02:34 -0500
committermillette <millette@controlyourself.ca>2008-11-13 12:02:34 -0500
commitf2506b0339d073294ce5e1a17c3ce9a661a983e9 (patch)
treec4f436e27c361d76c7da1bfca77e8e2c56ffd561 /lib
parentefabf7d34107fc494ef1009672ef9983f98821ee (diff)
trac31 let * preceding a url prevent its shortening.
darcs-hash:20081113170234-099f7-b714b0640370b8ecf37aa422455831dae5ce4c5e.gz
Diffstat (limited to 'lib')
-rw-r--r--lib/util.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/util.php b/lib/util.php
index 3b2ee9d87..ee1a149a7 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -750,8 +750,8 @@ function common_render_uri_thingy($matches) {
function common_shorten_links($text) {
$r = htmlspecialchars($text);
// \s = not a horizontal whitespace character (since PHP 5.2.4)
-// $r = preg_replace('@[^*]https?://[^)\]>\s]+@e', "common_shorten_link('\\0')", $r);
- $r = preg_replace('@https?://[^)\]>\s]+@e', "common_shorten_link('\\0')", $r);
+ $r = preg_replace('@[^*]https?://[^)\]>\s]+@e', "common_shorten_link('\\0')", $r);
+// $r = preg_replace('@https?://[^)\]>\s]+@e', "common_shorten_link('\\0')", $r);
return $r;
}