diff options
| author | Tobias Diekershoff <tobias.diekershoff@gmx.net> | 2011-03-17 07:08:48 +0100 |
|---|---|---|
| committer | Tobias Diekershoff <tobias.diekershoff@gmx.net> | 2011-03-17 07:08:48 +0100 |
| commit | f4f5095e19badcc85453182b86bff97f57228257 (patch) | |
| tree | af391e8f809c3ab7ae183c72a364ba09fd16702e /mod/item.php | |
| parent | 0c16d033efd4ee878ab94318e7980d373ad3994d (diff) | |
| parent | b3050d3bc8fc812f0579982e1c866ab07499e0a8 (diff) | |
| download | volse-hubzilla-f4f5095e19badcc85453182b86bff97f57228257.tar.gz volse-hubzilla-f4f5095e19badcc85453182b86bff97f57228257.tar.bz2 volse-hubzilla-f4f5095e19badcc85453182b86bff97f57228257.zip | |
Merge branch 'master' of git://github.com/friendika/friendika
Diffstat (limited to 'mod/item.php')
| -rw-r--r-- | mod/item.php | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/mod/item.php b/mod/item.php index 90fb546bc..6e6e822d0 100644 --- a/mod/item.php +++ b/mod/item.php @@ -212,6 +212,8 @@ function item_post(&$a) { if(count($tags)) { foreach($tags as $tag) { if(strpos($tag,'#') === 0) { + if(strpos($tag,'[url=')) + continue; $basetag = str_replace('_',' ',substr($tag,1)); $body = str_replace($tag,'#[url=' . $a->get_baseurl() . '/search?search=' . rawurlencode($basetag) . ']' . $basetag . '[/url]',$body); if(strlen($str_tags)) @@ -220,6 +222,8 @@ function item_post(&$a) { continue; } if(strpos($tag,'@') === 0) { + if(strpos($tag,'[url=')) + continue; $stat = false; $name = substr($tag,1); if((strpos($name,'@')) || (strpos($name,'http://'))) { |