Commit 892e9cd8 authored by Zot's avatar Zot Committed by Mario

minor zot6 compatibility issues uncovered through daily use


(cherry picked from commit becaa3b9)
parent 109c66ae
Pipeline #144450 passed with stages
in 6 minutes and 29 seconds
......@@ -151,7 +151,6 @@ class Activity {
static function fetch_image($x) {
$ret = [
'type' => 'Image',
'id' => $x['id'],
......
......@@ -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'])
);
}
......
......@@ -390,7 +390,7 @@ function photo_upload($channel, $observer, $args) {
'edited' => $p['edited'],
'id' => z_root() . '/photos/' . $channel['channel_address'] . '/image/' . $photo_hash,
'link' => $link,
'body' => $obj_body
'body' => $summary
);
$target = array(
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment