GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Merge branch '0.8.x' of git@gitorious.org:laconica/mainline into 0.8.x

Browse Source
This commit is contained in:
Evan Prodromou
2009-08-27 14:18:51 -07:00
parent 82b0927f58 2dd5a5f86d
commit bbb830e14c
7 changed files with 283 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/util.php
View File

@@ -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);