Merge branch 'dev' into 'dev'

minor zot6 compatibility issues uncovered through daily use See merge request hubzilla/core!1671
2019-06-18 10:35:50 +02:00
parent 619b39f955 becaa3b920
commit fc2a038ee1
3 changed files with 3 additions and 3 deletions
--- 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(