Browse Source

Merge pull request #3674 from annando/display

Display hadn't shown public items that weren't known to the user
pull/3676/head
Tobias Diekershoff 5 years ago committed by GitHub
parent
commit
a62e8b7c05
  1. 7
      mod/display.php

7
mod/display.php

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

Loading…
Cancel
Save