aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2012-03-29 21:18:47 -0700
committerfriendica <info@friendica.com>2012-03-29 21:18:47 -0700
commit9332312ce93cd4b7113f31109d4c1dd1656f6189 (patch)
treeda2af7eaef58b56dc9cc4bf137060251016b2dc3
parent168cf3b9d4ca004dd589d14f4c8f31cd0d7e1265 (diff)
downloadvolse-hubzilla-9332312ce93cd4b7113f31109d4c1dd1656f6189.tar.gz
volse-hubzilla-9332312ce93cd4b7113f31109d4c1dd1656f6189.tar.bz2
volse-hubzilla-9332312ce93cd4b7113f31109d4c1dd1656f6189.zip
silly mistake
-rwxr-xr-xinclude/conversation.php5
1 files changed, 3 insertions, 2 deletions
diff --git a/include/conversation.php b/include/conversation.php
index 6283cfe0a..1c3ee43b0 100755
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -167,9 +167,10 @@ function localize_item(&$item){
}
}
$matches = null;
- if(preg_match_all('/@[url=(.*?)]/is',$item['body'],$matches,PREG_SET_ORDER)) {
+ if(preg_match_all('/@\[url=(.*?)\]/is',$item['body'],$matches,PREG_SET_ORDER)) {
foreach($matches as $mtch) {
- $item['body'] = str_replace($mtch[0],'@[url=' . zrl($mtch[1]). ']',$item['body']);
+ if(! strpos($mtch[1],'zrl='))
+ $item['body'] = str_replace($mtch[0],'@[url=' . zrl($mtch[1]). ']',$item['body']);
}
}