The plink in Diaspora posts now links to the correct place

diff --git a/include/diaspora.php b/include/diaspora.php
index 63958f30bf416616548a769f584d9bcdd73e0252..79e4ac51bfeceb2c63d0aa63dd4aa8b107e8b617 100644 (file)
--- a/include/diaspora.php
+++ b/include/diaspora.php
@@ -1183,7 +1183,7 @@ class Diaspora {
         * @return array the item record
         */
        private static function parent_item($uid, $guid, $author, $contact) {
-               $r = q("SELECT `id`, `parent`, `body`, `wall`, `uri`, `private`, `origin`,
+               $r = q("SELECT `id`, `parent`, `body`, `wall`, `uri`, `guid`, `private`, `origin`,
                                `author-name`, `author-link`, `author-avatar`,
                                `owner-name`, `owner-link`, `owner-avatar`
                        FROM `item` WHERE `uid` = %d AND `guid` = '%s' LIMIT 1",
@@ -1266,26 +1266,38 @@ class Diaspora {
         *
         * @return string the post link
         */
-       private static function plink($addr, $guid) {
+       private static function plink($addr, $guid, $parent_guid = '') {
                $r = q("SELECT `url`, `nick`, `network` FROM `fcontact` WHERE `addr`='%s' LIMIT 1", dbesc($addr));
 
                // Fallback
-               if (!$r)
-                       return "https://".substr($addr,strpos($addr,"@")+1)."/posts/".$guid;
+               if (!dbm::is_result($r)) {
+                       if ($parent_guid != '') {
+                               return "https://".substr($addr,strpos($addr,"@") + 1)."/posts/".$parent_guid."#".$guid;
+                       } else {
+                               return "https://".substr($addr,strpos($addr,"@") + 1)."/posts/".$guid;
+                       }
+               }
 
                // Friendica contacts are often detected as Diaspora contacts in the "fcontact" table
                // So we try another way as well.
                $s = q("SELECT `network` FROM `gcontact` WHERE `nurl`='%s' LIMIT 1", dbesc(normalise_link($r[0]["url"])));
-               if ($s)
+               if (dbm::is_result($s)) {
                        $r[0]["network"] = $s[0]["network"];
+               }
 
-               if ($r[0]["network"] == NETWORK_DFRN)
-                       return(str_replace("/profile/".$r[0]["nick"]."/", "/display/".$guid, $r[0]["url"]."/"));
+               if ($r[0]["network"] == NETWORK_DFRN) {
+                       return str_replace("/profile/".$r[0]["nick"]."/", "/display/".$guid, $r[0]["url"]."/");
+               }
 
-               if (self::is_redmatrix($r[0]["url"]))
+               if (self::is_redmatrix($r[0]["url"])) {
                        return $r[0]["url"]."/?f=&mid=".$guid;
+               }
 
-               return "https://".substr($addr,strpos($addr,"@")+1)."/posts/".$guid;
+               if ($parent_guid != '') {
+                       return "https://".substr($addr,strpos($addr,"@")+1)."/posts/".$parent_guid."#".$guid;
+               } else {
+                       return "https://".substr($addr,strpos($addr,"@")+1)."/posts/".$guid;
+               }
        }
 
        /**
@@ -1459,6 +1471,8 @@ class Diaspora {
 
                $datarray["changed"] = $datarray["created"] = $datarray["edited"] = $created_at;
 
+               $datarray["plink"] = self::plink($author, $guid, $parent_item['guid']);
+
                $body = diaspora2bb($text);
 
                $datarray["body"] = self::replace_people_guid($body, $person["url"]);

diff --git a/view/theme/frio/templates/wall_thread.tpl b/view/theme/frio/templates/wall_thread.tpl
index 55681f53dd2eb0920689bd86fe9448ae498f732f..dc339c83d053b060ebe5ee4c60f59b29ae5e2195 100644 (file)
--- a/view/theme/frio/templates/wall_thread.tpl
+++ b/view/theme/frio/templates/wall_thread.tpl
@@ -233,7 +233,7 @@ as the value of $top_child_total (this is done at the end of this file)
                        <h5 class="media-heading">
                                <a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link userinfo"><span class="fakelink">{{$item.name}}</span></a>
                                <span class="text-muted">
-                                       <small><span title="{{$item.localtime}}" data-toggle="tooltip">{{$item.ago}}</span> {{if $item.location}}&nbsp;&mdash;&nbsp;({{$item.location}}){{/if}}</small>
+                                       <small><a class="time" href="{{$item.plink.orig}}" title="{{$item.localtime}}" data-toggle="tooltip">{{$item.ago}}</a> {{if $item.location}}&nbsp;&mdash;&nbsp;({{$item.location}}){{/if}}</small>
                                </span>
                        </h5>
                </div>