From 892e9cd835612c8155bf3c15436137f94abbb667 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Tue, 18 Jun 2019 01:30:05 +0000 Subject: minor zot6 compatibility issues uncovered through daily use (cherry picked from commit becaa3b920bfe87c031c01bdf35d35db5c82e31e) --- Zotlabs/Lib/Activity.php | 1 - Zotlabs/Module/Item.php | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'Zotlabs') diff --git a/Zotlabs/Lib/Activity.php b/Zotlabs/Lib/Activity.php index 2998dbe98..0808fe33f 100644 --- a/Zotlabs/Lib/Activity.php +++ b/Zotlabs/Lib/Activity.php @@ -151,7 +151,6 @@ class Activity { static function fetch_image($x) { - $ret = [ 'type' => 'Image', 'id' => $x['id'], diff --git a/Zotlabs/Module/Item.php b/Zotlabs/Module/Item.php index 6bc8c645f..965cbf173 100644 --- a/Zotlabs/Module/Item.php +++ b/Zotlabs/Module/Item.php @@ -96,11 +96,12 @@ class Item extends Controller { } // if we don't have a parent id belonging to the signer see if we can obtain one as a visitor that we have permission to access + // with a bias towards those items owned by channels on this site (item_wall = 1) $sql_extra = item_permissions_sql(0); if (! $i) { - $i = q("select id as item_id from item where mid = '%s' $item_normal $sql_extra limit 1", + $i = q("select id as item_id from item where mid = '%s' $item_normal $sql_extra order by item_wall desc limit 1", dbesc($r[0]['parent_mid']) ); } -- cgit v1.2.3