From: Roland Häder <roland@mxchange.org>
Date: Tue, 20 Dec 2016 14:44:31 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/develop' into develop
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=b9e4b9f2747deb5cdd7d7f68e200496e0c3162aa;p=friendica.git

Merge remote-tracking branch 'upstream/develop' into develop

Changes in #3034 were somehow conflicting. :-(

Signed-off-by: Roland Häder <roland@mxchange.org>

Conflicts:
	include/like.php
	mod/photos.php
	mod/subthread.php
---

b9e4b9f2747deb5cdd7d7f68e200496e0c3162aa
diff --cc include/like.php
index 8223cf3626,e997e05d6b..b04b9b4e09
--- a/include/like.php
+++ b/include/like.php
@@@ -164,8 -163,8 +164,8 @@@ function do_like($item_id, $verb) 
  	$post_type = (($item['resource-id']) ? t('photo') : t('status'));
  	if($item['object-type'] === ACTIVITY_OBJ_EVENT)
  		$post_type = t('event');
- 	$objtype = (($item['resource-id']) ? ACTIVITY_OBJ_PHOTO : ACTIVITY_OBJ_NOTE );
+ 	$objtype = (($item['resource-id']) ? ACTIVITY_OBJ_IMAGE : ACTIVITY_OBJ_NOTE );
 -	$link = xmlify('<link rel="alternate" type="text/html" href="' . $a->get_baseurl() . '/display/' . $owner['nickname'] . '/' . $item['id'] . '" />' . "\n") ;
 +	$link = xmlify('<link rel="alternate" type="text/html" href="' . App::get_baseurl() . '/display/' . $owner['nickname'] . '/' . $item['id'] . '" />' . "\n") ;
  	$body = $item['body'];
  
  	$obj = <<< EOT
diff --cc mod/photos.php
index 8d97a30051,1ef43f423a..317d7272b4
--- a/mod/photos.php
+++ b/mod/photos.php
@@@ -694,9 -694,9 +694,9 @@@ function photos_post(App &$a) 
  						$arr['object'] .= xmlify('<link rel="photo" type="'.$p[0]['type'].'" href="' . $tagged[3]['photo'] . '" />' . "\n");
  					$arr['object'] .= '</link></object>' . "\n";
  
- 					$arr['target'] = '<target><type>' . ACTIVITY_OBJ_PHOTO . '</type><title>' . $p[0]['desc'] . '</title><id>'
+ 					$arr['target'] = '<target><type>' . ACTIVITY_OBJ_IMAGE . '</type><title>' . $p[0]['desc'] . '</title><id>'
 -						. $a->get_baseurl() . '/photos/' . $owner_record['nickname'] . '/image/' . $p[0]['resource-id'] . '</id>';
 -					$arr['target'] .= '<link>' . xmlify('<link rel="alternate" type="text/html" href="' . $a->get_baseurl() . '/photos/' . $owner_record['nickname'] . '/image/' . $p[0]['resource-id'] . '" />' . "\n" . '<link rel="preview" type="'.$p[0]['type'].'" href="' . $a->get_baseurl() . "/photo/" . $p[0]['resource-id'] . '-' . $best . '.' . $ext . '" />') . '</link></target>';
 +						. App::get_baseurl() . '/photos/' . $owner_record['nickname'] . '/image/' . $p[0]['resource-id'] . '</id>';
 +					$arr['target'] .= '<link>' . xmlify('<link rel="alternate" type="text/html" href="' . App::get_baseurl() . '/photos/' . $owner_record['nickname'] . '/image/' . $p[0]['resource-id'] . '" />' . "\n" . '<link rel="preview" type="'.$p[0]['type'].'" href="' . App::get_baseurl() . "/photo/" . $p[0]['resource-id'] . '-' . $best . '.' . $ext . '" />') . '</link></target>';
  
  					$item_id = item_store($arr);
  					if ($item_id) {
diff --cc mod/subthread.php
index 3d16f8ca9c,b15b954742..958f4ba03b
--- a/mod/subthread.php
+++ b/mod/subthread.php
@@@ -86,8 -85,8 +86,8 @@@ function subthread_content(App &$a) 
  	$uri = item_new_uri($a->get_hostname(),$owner_uid);
  
  	$post_type = (($item['resource-id']) ? t('photo') : t('status'));
- 	$objtype = (($item['resource-id']) ? ACTIVITY_OBJ_PHOTO : ACTIVITY_OBJ_NOTE );
+ 	$objtype = (($item['resource-id']) ? ACTIVITY_OBJ_IMAGE : ACTIVITY_OBJ_NOTE );
 -	$link = xmlify('<link rel="alternate" type="text/html" href="' . $a->get_baseurl() . '/display/' . $owner['nickname'] . '/' . $item['id'] . '" />' . "\n") ;
 +	$link = xmlify('<link rel="alternate" type="text/html" href="' . App::get_baseurl() . '/display/' . $owner['nickname'] . '/' . $item['id'] . '" />' . "\n") ;
  	$body = $item['body'];
  
  	$obj = <<< EOT
diff --cc mod/tagger.php
index 4d93047e26,d6f421205c..b1f91d1bc4
--- a/mod/tagger.php
+++ b/mod/tagger.php
@@@ -60,10 -60,10 +60,10 @@@ function tagger_content(App &$a) 
  	$uri = item_new_uri($a->get_hostname(),$owner_uid);
  	$xterm = xmlify($term);
  	$post_type = (($item['resource-id']) ? t('photo') : t('status'));
- 	$targettype = (($item['resource-id']) ? ACTIVITY_OBJ_PHOTO : ACTIVITY_OBJ_NOTE );
+ 	$targettype = (($item['resource-id']) ? ACTIVITY_OBJ_IMAGE : ACTIVITY_OBJ_NOTE );
  
  	$link = xmlify('<link rel="alternate" type="text/html" href="'
 -		. $a->get_baseurl() . '/display/' . $owner['nickname'] . '/' . $item['id'] . '" />' . "\n") ;
 +		. App::get_baseurl() . '/display/' . $owner['nickname'] . '/' . $item['id'] . '" />' . "\n") ;
  
  	$body = xmlify($item['body']);