diff options
| author | Mario <mario@mariovavti.com> | 2019-06-18 10:35:50 +0200 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2019-06-18 10:35:50 +0200 |
| commit | fc2a038ee1ba366d8ed3d6e301e8de3b05290889 (patch) | |
| tree | 612d3818ba069e1a54023ec6dd5020269eee6f69 | |
| parent | 619b39f9553db3f88b5a8061c423f1eee37bdd3b (diff) | |
| parent | becaa3b920bfe87c031c01bdf35d35db5c82e31e (diff) | |
| download | volse-hubzilla-fc2a038ee1ba366d8ed3d6e301e8de3b05290889.tar.gz volse-hubzilla-fc2a038ee1ba366d8ed3d6e301e8de3b05290889.tar.bz2 volse-hubzilla-fc2a038ee1ba366d8ed3d6e301e8de3b05290889.zip | |
Merge branch 'dev' into 'dev'
minor zot6 compatibility issues uncovered through daily use
See merge request hubzilla/core!1671
| -rw-r--r-- | Zotlabs/Lib/Activity.php | 1 | ||||
| -rw-r--r-- | Zotlabs/Module/Item.php | 3 | ||||
| -rw-r--r-- | include/photos.php | 2 |
3 files changed, 3 insertions, 3 deletions
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']) ); } diff --git a/include/photos.php b/include/photos.php index 7ea2729ae..7fd712f3e 100644 --- a/include/photos.php +++ b/include/photos.php @@ -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( |