Merge remote branch 'upstream/master'

[friendica.git] / include / conversation.php

diff --git a/include/conversation.php b/include/conversation.php
index 37856651e17f266012a3c473c22b34d1a4c925cb..1c3ee43b0a41bf117668cf3fa2b7194a7f5876a5 100755 (executable)
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -166,6 +166,13 @@ function localize_item(&$item){
                        }
                }
        }
+       $matches = null;
+       if(preg_match_all('/@\[url=(.*?)\]/is',$item['body'],$matches,PREG_SET_ORDER)) {
+               foreach($matches as $mtch) {
+                       if(! strpos($mtch[1],'zrl='))
+                               $item['body'] = str_replace($mtch[0],'@[url=' . zrl($mtch[1]). ']',$item['body']);
+               }
+       }
 
 }