diff options
author | Evan Prodromou <evan@status.net> | 2009-08-27 14:18:51 -0700 |
---|---|---|
committer | Evan Prodromou <evan@status.net> | 2009-08-27 14:18:51 -0700 |
commit | bbb830e14c718c687f0636710a1827c90b11f4cc (patch) | |
tree | ff637b6b10ecd760c410f8dfea81f2f7113989ab /lib/util.php | |
parent | 82b0927f5838f3c12816e03712df9460a9f77b72 (diff) | |
parent | 2dd5a5f86d5242362499c381c8d9519f40a8925b (diff) |
Merge branch '0.8.x' of git@gitorious.org:laconica/mainline into 0.8.x
Diffstat (limited to 'lib/util.php')
-rw-r--r-- | lib/util.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/util.php b/lib/util.php index 4ad5c48f5..cedb70873 100644 --- a/lib/util.php +++ b/lib/util.php @@ -413,7 +413,7 @@ function common_replace_urls_callback($text, $callback, $notice_id = null) { // Start off with a regex $regex = '#'. '(?:^|[\s\(\)\[\]\{\}\\\'\\\";]+)(?![\@\!\#])'. - '(?P<url>'. + '('. '(?:'. '(?:'. //Known protocols '(?:'. @@ -454,7 +454,7 @@ function common_replace_urls_callback($text, $callback, $notice_id = null) { } function callback_helper($matches, $callback, $notice_id) { - $url=$matches['url']; + $url=$matches[1]; $left = strpos($matches[0],$url); $right = $left+strlen($url); |