harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' into 'dev'

Browse Source 
minor zot6 compatibility issues uncovered through daily use

See merge request hubzilla/core!1671
This commit is contained in:
Mario 2019-06-18 10:35:50 +02:00
commit fc2a038ee1
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Zotlabs/Lib/Activity.php
View File

@ -151,7 +151,6 @@ class Activity {
static function fetch_image($x) { static function fetch_image($x) {
$ret = [ $ret = [
'type' => 'Image', 'type' => 'Image',
'id' => $x['id'], 'id' => $x['id'],

3
Zotlabs/Module/Item.php
View File

@ -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 // 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); $sql_extra = item_permissions_sql(0);
if (! $i) { 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']) dbesc($r[0]['parent_mid'])
); );
} }

2
include/photos.php
View File

@ -390,7 +390,7 @@ function photo_upload($channel, $observer, $args) {
'edited' => $p['edited'], 'edited' => $p['edited'],
'id' => z_root() . '/photos/' . $channel['channel_address'] . '/image/' . $photo_hash, 'id' => z_root() . '/photos/' . $channel['channel_address'] . '/image/' . $photo_hash,
'link' => $link, 'link' => $link,
'body' => $obj_body 'body' => $summary
); );
$target = array( $target = array(