Merge branch 'develop' into rewrite/gravity-constants

[friendica.git] / mod / share.php

diff --git a/mod/share.php b/mod/share.php
index b4c2bc50ddb7efc339dc8bd19245472633bf66ec..de0159df78a83a980a9ed7dc668f6037e09f2d8f 100644 (file)
--- a/mod/share.php
+++ b/mod/share.php
@@ -42,11 +42,8 @@ function share_init(App $a) {
        }
 
        $shared = BBCode::fetchShareAttributes($item['body']);
-       if (!empty($shared['message_id']) || !empty($shared['link'])) {
+       if (empty($shared['comment']) && (!empty($shared['message_id']) || !empty($shared['link']))) {
                $content = '[share]' . ($shared['message_id'] ?: $shared['link']) . '[/share]';
-       } elseif (strpos($item['body'], '[/share]') !== false) {
-               $pos = strpos($item['body'], '[share');
-               $content = substr($item['body'], $pos);
        } else {
                $content = '[share]' . $item['uri'] . '[/share]';
        }