Update getShareOpeningTag::getShareOpeningTag method signature

- Optional parameter $guid is now at the end
- Always provided parameter $posted is now mandatory

diff --git a/include/api.php b/include/api.php
index d314988ed867eb861d90143c4df2443d52473427..d55183fbf7d757024636d6cc579bc8bf2eba0f19 100644 (file)
--- a/include/api.php
+++ b/include/api.php
@@ -2043,7 +2043,7 @@ function api_statuses_repeat($type)
                        $pos = strpos($item['body'], "[share");
                        $post = substr($item['body'], $pos);
                } else {
-                       $post = BBCode::getShareOpeningTag($item['author-name'], $item['author-link'], $item['author-avatar'], $item['guid'], $item['created'], $item['plink']);
+                       $post = BBCode::getShareOpeningTag($item['author-name'], $item['author-link'], $item['author-avatar'], $item['plink'], $item['created'], $item['guid']);
 
                        if (!empty($item['title'])) {
                                $post .= '[h3]' . $item['title'] . "[/h3]\n";

diff --git a/mod/share.php b/mod/share.php
index fe4b7bfe7fc9ce342fc41ad768d3f592a7eeae6d..a8ac3bd8b57a796b88a6044458849c04d70f2648 100644 (file)
--- a/mod/share.php
+++ b/mod/share.php
@@ -43,7 +43,7 @@ function share_init(App $a) {
                $pos = strpos($item['body'], "[share");
                $o = substr($item['body'], $pos);
        } else {
-               $o = BBCode::getShareOpeningTag($item['author-name'], $item['author-link'], $item['author-avatar'], $item['guid'], $item['created'], $item['plink']);
+               $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";

diff --git a/src/Content/Text/BBCode.php b/src/Content/Text/BBCode.php
index 1cd8e438cd310a1f3656c17fb5f4ef14c6d55628..266182b3b8672e9e32590b16d561b637447d8c48 100644 (file)
--- a/src/Content/Text/BBCode.php
+++ b/src/Content/Text/BBCode.php
@@ -2225,30 +2225,28 @@ class BBCode
        }
 
        /**
-        * @param $author
-        * @param $profile
-        * @param $avatar
-        * @param $guid
-        * @param $posted
-        * @param $link
+        * @param string      $author  Author display name
+        * @param string      $profile Author profile URL
+        * @param string      $avatar  Author profile picture URL
+        * @param string      $link    Post source URL
+        * @param string      $posted  Post created date
+        * @param string|null $guid    Post guid (if any)
         * @return string
         * @TODO Rewrite to handle over whole record array
         */
-       public static function getShareOpeningTag($author, $profile, $avatar, $guid, $posted, $link)
+       public static function getShareOpeningTag(string $author, string $profile, string $avatar, string $link, string $posted, string $guid = null)
        {
-               $header = "[share author='" . str_replace(["'", "[", "]"], ["'", "[", "]"], $author).
-                       "' profile='" . str_replace(["'", "[", "]"], ["'", "[", "]"], $profile).
-                       "' avatar='" . str_replace(["'", "[", "]"], ["'", "[", "]"], $avatar);
+               $header = "[share author='" . str_replace(["'", "[", "]"], ["'", "[", "]"], $author) .
+                       "' profile='" . str_replace(["'", "[", "]"], ["'", "[", "]"], $profile) .
+                       "' avatar='" . str_replace(["'", "[", "]"], ["'", "[", "]"], $avatar) .
+                       "' link='" . str_replace(["'", "[", "]"], ["'", "[", "]"], $link) .
+                       "' posted='" . str_replace(["'", "[", "]"], ["'", "[", "]"], $posted);
 
                if ($guid) {
                        $header .= "' guid='" . str_replace(["'", "[", "]"], ["'", "[", "]"], $guid);
                }
 
-               if ($posted) {
-                       $header .= "' posted='" . str_replace(["'", "[", "]"], ["'", "[", "]"], $posted);
-               }
-
-               $header .= "' link='" . str_replace(["'", "[", "]"], ["'", "[", "]"], $link)."']";
+               $header  .= "']";
 
                return $header;
        }

diff --git a/src/Protocol/ActivityPub/Transmitter.php b/src/Protocol/ActivityPub/Transmitter.php
index dfe7c77df7c6270acd4c43b90cbc9b98de7afc81..e7a16f0527d2bdf27d7f70625bdca61bab0b5ddd 100644 (file)
--- a/src/Protocol/ActivityPub/Transmitter.php
+++ b/src/Protocol/ActivityPub/Transmitter.php
@@ -864,7 +864,7 @@ class Transmitter
 
                                // Disguise forum posts as reshares. Will later be converted to a real announce
                                $item['body'] = BBCode::getShareOpeningTag($item['author-name'], $item['author-link'], $item['author-avatar'],
-                                       $item['guid'], $item['created'], $item['plink']) . $item['body'] . '[/share]';
+                                       $item['plink'], $item['created'], $item['guid']) . $item['body'] . '[/share]';
                        }
                }
 

diff --git a/src/Protocol/Diaspora.php b/src/Protocol/Diaspora.php
index 3833aae23cb97ada8be206f0a4b2c29a8e3f3f59..7f46908799e0461e99efadbb4442f37f371b4968 100644 (file)
--- a/src/Protocol/Diaspora.php
+++ b/src/Protocol/Diaspora.php
@@ -2799,9 +2799,9 @@ class Diaspora
                        $original_item["author-name"],
                        $original_item["author-link"],
                        $original_item["author-avatar"],
-                       $original_item["guid"],
+                       $orig_url,
                        $original_item["created"],
-                       $orig_url
+                       $original_item["guid"]
                );
 
                if (!empty($original_item['title'])) {
@@ -3677,7 +3677,7 @@ class Diaspora
                        if ($item['author-link'] != $item['owner-link']) {
                                require_once 'mod/share.php';
                                $body = BBCode::getShareOpeningTag($item['author-name'], $item['author-link'], $item['author-avatar'],
-                                       "", $item['created'], $item['plink']) . $body . '[/share]';
+                                       $item['plink'], $item['created']) . $body . '[/share]';
                        }
 
                        // convert to markdown