From 9332312ce93cd4b7113f31109d4c1dd1656f6189 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Thu, 29 Mar 2012 21:18:47 -0700
Subject: [PATCH] silly mistake
---
include/conversation.php | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/include/conversation.php b/include/conversation.php
index 6283cfe0ae..1c3ee43b0a 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']);
}
}