keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Michael 2018-06-25 06:45:05 +00:00
parent 6dbbeaf8f6
commit 5f3f349006
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
mod/community.php
View file

@ -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);

5
src/Model/Item.php
View file

@ -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']);