"author-link" and "owner-link" aren't stored anymore in the item table

diff --git a/mod/community.php b/mod/community.php
index 59be7487bdca55a8318410b80e4eeab16f2dc199..1e6162fb8e57b2b5b890c4226f9f89efa8c28780 100644 (file)
--- a/mod/community.php
+++ b/mod/community.php
@@ -189,9 +189,10 @@ function community_content(App $a, $update = 0)
 function community_getitems($start, $itemspage, $content)
 {
        if ($content == 'local') {
-               $r = dba::p("SELECT `item`.`uri`, `item`.`author-link` FROM `thread`
+               $r = dba::p("SELECT `item`.`uri`, `author`.`url` AS `author-link` FROM `thread`
                        INNER JOIN `user` ON `user`.`uid` = `thread`.`uid` AND NOT `user`.`hidewall`
                        INNER JOIN `item` ON `item`.`id` = `thread`.`iid`
+                       INNER JOIN `contact` AS `author` ON `author`.`id`=`item`.`author-id`
                        WHERE `thread`.`visible` AND NOT `thread`.`deleted` AND NOT `thread`.`moderated`
                        AND NOT `thread`.`private` AND `thread`.`wall` AND `thread`.`origin`
                        ORDER BY `thread`.`commented` DESC LIMIT " . intval($start) . ", " . intval($itemspage)
@@ -200,7 +201,7 @@ function community_getitems($start, $itemspage, $content)
        } elseif ($content == 'global') {
                $r = dba::p("SELECT `uri` FROM `thread`
                                INNER JOIN `item` ON `item`.`id` = `thread`.`iid`
-                               INNER JOIN `contact` AS `author` ON `author`.`id`=`item`.`author-id`
+                               INNER JOIN `contact` AS `author` ON `author`.`id`=`item`.`author-id`
                                WHERE `thread`.`uid` = 0 AND NOT `author`.`hidden` AND NOT `author`.`blocked`
                                ORDER BY `thread`.`commented` DESC LIMIT " . intval($start) . ", " . intval($itemspage));
                return dba::inArray($r);

diff --git a/src/Model/Item.php b/src/Model/Item.php
index 0dd0b264ea440528f61e95502c6cffaaba4b2559..5297f0b4e479f35ff2248d1d9fec621ed30e6c34 100644 (file)
--- a/src/Model/Item.php
+++ b/src/Model/Item.php
@@ -1075,11 +1075,12 @@ class Item extends BaseObject
                        return 0;
                }
 
-               //unset($item['author-link']);
+               // These fields aren't stored anymore in the item table, they are fetched upon request
+               unset($item['author-link']);
                unset($item['author-name']);
                unset($item['author-avatar']);
 
-               //unset($item['owner-link']);
+               unset($item['owner-link']);
                unset($item['owner-name']);
                unset($item['owner-avatar']);