aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2019-06-17 18:30:05 -0700
committerzotlabs <mike@macgirvin.com>2019-06-17 18:30:05 -0700
commitbecaa3b920bfe87c031c01bdf35d35db5c82e31e (patch)
tree1ac1eb468c47dfb27fc205d9450d974e0654f8f3 /Zotlabs
parent57ed9ec8e2e4d80e5508a62270d3a1d589dbba6b (diff)
downloadvolse-hubzilla-becaa3b920bfe87c031c01bdf35d35db5c82e31e.tar.gz
volse-hubzilla-becaa3b920bfe87c031c01bdf35d35db5c82e31e.tar.bz2
volse-hubzilla-becaa3b920bfe87c031c01bdf35d35db5c82e31e.zip
minor zot6 compatibility issues uncovered through daily use
Diffstat (limited to 'Zotlabs')
-rw-r--r--Zotlabs/Lib/Activity.php1
-rw-r--r--Zotlabs/Module/Item.php3
2 files changed, 2 insertions, 2 deletions
diff --git a/Zotlabs/Lib/Activity.php b/Zotlabs/Lib/Activity.php
index bc86ae0e0..331e4f777 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'])
);
}