Merge pull request #11973 from MrPetovan/task/test-fixDateFormat

[friendica.git] / mod / share.php

diff --git a/mod/share.php b/mod/share.php
index 2f836c5aa06cc64aed2e9e2eedce9c88c59ecca9..b4c2bc50ddb7efc339dc8bd19245472633bf66ec 100644 (file)
--- a/mod/share.php
+++ b/mod/share.php
@@ -34,28 +34,21 @@ function share_init(App $a) {
                System::exit();
        }
 
-       $fields = ['private', 'body', 'author-name', 'author-link', 'author-avatar',
-               'guid', 'created', 'plink', 'title'];
+       $fields = ['private', 'body', 'uri'];
        $item = Post::selectFirst($fields, ['id' => $post_id]);
 
        if (!DBA::isResult($item) || $item['private'] == Item::PRIVATE) {
                System::exit();
        }
 
-       if (strpos($item['body'], "[/share]") !== false) {
-               $pos = strpos($item['body'], "[share");
-               $o = substr($item['body'], $pos);
+       $shared = BBCode::fetchShareAttributes($item['body']);
+       if (!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 {
-               $o = BBCode::getShareOpeningTag($item['author-name'], $item['author-link'], $item['author-avatar'], $item['plink'], $item['created'], $item['guid']);
-
-               if ($item['title']) {
-                       $o .= '[h3]'.$item['title'].'[/h3]'."\n";
-               }
-
-               $o .= $item['body'];
-               $o .= "[/share]";
+               $content = '[share]' . $item['uri'] . '[/share]';
        }
-
-       echo $o;
-       System::exit();
+       System::httpExit($content);
 }