summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormillette <millette@controlyourself.ca>2008-11-07 17:21:00 -0500
committermillette <millette@controlyourself.ca>2008-11-07 17:21:00 -0500
commit2a8a0c939960a93e616bad39daf4b2c0fdd5f87c (patch)
treed35ec3fa54e932d248c2390acde9d36d0361051a
parent9c3eb0d3619dcc469cba9bda07a3df8a72628320 (diff)
trac31 revert the "don't shorten URLs prefixed with a *" patch since we automatically shorten in notices > 140 chars
darcs-hash:20081107222100-099f7-18b3fc1c4e6939cdbc7a811a7df6f0e08068ea01.gz
-rw-r--r--lib/util.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/util.php b/lib/util.php
index 364e9e79c..14311a71d 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -750,7 +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);
return $r;
}