]> git.mxchange.org Git - friendica.git/commitdiff
Reshares had been detected falsely so that were rejected by Diaspora
authorMichael <heluecht@pirati.ca>
Thu, 3 May 2018 13:03:41 +0000 (13:03 +0000)
committerMichael <heluecht@pirati.ca>
Thu, 3 May 2018 13:03:41 +0000 (13:03 +0000)
src/Content/Text/BBCode.php
src/Protocol/Diaspora.php

index c3ac41ce435d2286c3214a7e7b64029001abf5db..6c441bac6fb152621a948c8a98da59cee72b4020 100644 (file)
@@ -965,7 +965,7 @@ class BBCode extends BaseObject
                                }
 
                                if (stripos(normalise_link($link), 'http://twitter.com/') === 0) {
-                                       $text .= '<br /><a href="' . $link . '" title="' . $link . '">' . $link . '</a>';
+                                       $text .= '<br /><a href="' . $link . '">' . $link . '</a>';
                                } else {
                                        $text .= $headline . '<blockquote>' . trim($share[3]) . "</blockquote><br />";
 
index 7b3b843a156bb91543e80f7a76131918190f2d8f..b6c6158871cbddddba9afc7e1ddaa5e1cbdc1b30 100644 (file)
@@ -3571,8 +3571,12 @@ class Diaspora
                                $ret["root_guid"] = $guid;
                                return $ret;
                        }
+               } elseif (($guid == "") && $complete) {
+                       return false;
                }
 
+               $ret["root_guid"] = $guid;
+
                $profile = "";
                preg_match("/profile='(.*?)'/ism", $attributes, $matches);
                if ($matches[1] != "") {
@@ -3593,10 +3597,6 @@ class Diaspora
                        }
                }
 
-               if (!empty($guid)) {
-                       $ret["root_guid"] = $guid;
-               }
-
                if (empty($ret) && !$complete) {
                        return true;
                }