Merge pull request #12025 from annando/no-boot-src-module

[friendica.git] / mod / share.php

diff --git a/mod/share.php b/mod/share.php
index b4c2bc50ddb7efc339dc8bd19245472633bf66ec..1ebce5291f6d5cd9aca61de6784337b3eed2e1bf 100644 (file)
--- a/mod/share.php
+++ b/mod/share.php
@@ -21,6 +21,7 @@
 
 use Friendica\App;
 use Friendica\Content\Text\BBCode;
+use Friendica\Core\Session;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\DI;
@@ -30,7 +31,7 @@ use Friendica\Model\Post;
 function share_init(App $a) {
        $post_id = ((DI::args()->getArgc() > 1) ? intval(DI::args()->getArgv()[1]) : 0);
 
-       if (!$post_id || !local_user()) {
+       if (!$post_id || !Session::getLocalUser()) {
                System::exit();
        }
 
@@ -42,11 +43,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]';
        }