Merge branch 'dev' into 'dev'

Sync cover photo removal with clones

See merge request hubzilla/core!1581
This commit is contained in:
Mario 2019-04-04 16:46:40 +02:00
commit 6adb489cb3

View File

@ -51,11 +51,24 @@ class Cover_photo extends \Zotlabs\Web\Controller {
// Remove cover photo
if(isset($_POST['remove'])) {
$r = q("SELECT resource_id FROM photo WHERE photo_usage = %d AND uid = %d LIMIT 1",
intval(PHOTO_COVER),
intval(local_channel())
);
if($r) {
q("update photo set photo_usage = %d where photo_usage = %d and uid = %d",
intval(PHOTO_NORMAL),
intval(PHOTO_COVER),
intval(local_channel())
);
$sync = attach_export_data($channel,$r[0]['resource_id']);
if($sync)
build_sync_packet($channel['channel_id'],array('file' => array($sync)));
}
goaway(z_root() . '/cover_photo');
}
@ -206,7 +219,6 @@ logger('gis: ' . print_r($gis,true));
return;
}
$channel = \App::get_channel();
$this->send_cover_photo_activity($channel,$base_image,$profile);
$sync = attach_export_data($channel,$base_image['resource_id']);