Merge remote-tracking branch 'upstream/develop' into term2tag

[friendica.git] / src / Protocol / Diaspora.php

diff --git a/src/Protocol/Diaspora.php b/src/Protocol/Diaspora.php
index 7c8fd81f7c9c73621ddf5acb5df3fcf652045b09..a6369a2bfa43c5ca67a4d4d8fa9f7d5894f13776 100644 (file)
--- a/src/Protocol/Diaspora.php
+++ b/src/Protocol/Diaspora.php
@@ -4016,30 +4016,24 @@ class Diaspora
 
                Logger::log("Got relayable data ".$type." for item ".$item["guid"]." (".$item["id"].")", Logger::DEBUG);
 
-               // Old way - is used by the internal Friendica functions
-               /// @todo Change all signatur storing functions to the new format
-               if ($item['signed_text'] && $item['signature'] && $item['signer']) {
-                       $message = self::messageFromSignature($item);
-               } else {// New way
-                       $msg = json_decode($item['signed_text'], true);
-
-                       $message = [];
-                       if (is_array($msg)) {
-                               foreach ($msg as $field => $data) {
-                                       if (!$item["deleted"]) {
-                                               if ($field == "diaspora_handle") {
-                                                       $field = "author";
-                                               }
-                                               if ($field == "target_type") {
-                                                       $field = "parent_type";
-                                               }
+               $msg = json_decode($item['signed_text'], true);
+
+               $message = [];
+               if (is_array($msg)) {
+                       foreach ($msg as $field => $data) {
+                               if (!$item["deleted"]) {
+                                       if ($field == "diaspora_handle") {
+                                               $field = "author";
+                                       }
+                                       if ($field == "target_type") {
+                                               $field = "parent_type";
                                        }
-
-                                       $message[$field] = $data;
                                }
-                       } else {
-                               Logger::log("Signature text for item ".$item["guid"]." (".$item["id"].") couldn't be extracted: ".$item['signed_text'], Logger::DEBUG);
+
+                               $message[$field] = $data;
                        }
+               } else {
+                       Logger::log("Signature text for item ".$item["guid"]." (".$item["id"].") couldn't be extracted: ".$item['signed_text'], Logger::DEBUG);
                }
 
                $message["parent_author_signature"] = self::signature($owner, $message);