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

Merge pull request #3674 from annando/display

Browse source 
Display hadn't shown public items that weren't known to the user
This commit is contained in:
Tobias Diekershoff 2017-08-30 22:34:51 +02:00 committed by GitHub
commit a62e8b7c05
1 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
mod/display.php
View file

@ -382,11 +382,9 @@ function display_content(App $a, $update = 0) {
} }
} }
$r = dba::p(item_query()." AND `item`.`uid` = ? $r = dba::p(item_query()."AND `item`.`parent` = (SELECT `parent` FROM `item` WHERE `id` = ?)
AND `item`.`parent` = (SELECT `parent` FROM `item` WHERE `id` = ?)
$sql_extra $sql_extra
ORDER BY `parent` DESC, `gravity` ASC, `id` ASC", ORDER BY `parent` DESC, `gravity` ASC, `id` ASC",
$a->profile['uid'],
$item_id $item_id
); );
@ -484,12 +482,11 @@ function display_content(App $a, $update = 0) {
return $o; return $o;
} }
$r = dba::fetch_first("SELECT `id`,`deleted` FROM `item` WHERE `id` = ? OR `uri` = ? LIMIT 1", $r = dba::fetch_first("SELECT `id`,`deleted` FROM `item` WHERE `id` = ? OR `uri` = ? LIMIT 1",
$item_id, $item_id,
$item_id $item_id
); );
if ($r) { if (dbm::is_result($r)) {
if ($r['deleted']) { if ($r['deleted']) {
notice(t('Item has been removed.') . EOL); notice(t('Item has been removed.') . EOL);
} else { } else {