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

diff --cc include/like.php
index 8223cf3626080ec9803ac0fb8f8819ffb13012da,e997e05d6b0e43601d6924dd1bf23ebec532915c..b04b9b4e0991540366cc3e9a18f27d377357f1ab
--- 1/include/like.php
--- 2/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 include/notifier.php
Simple merge

diff --cc mod/photos.php
index 8d97a30051afd94aac3f60da2969201715ec7787,1ef43f423ab3f6105eb63094a114b9af8a8977b8..317d7272b41d689889e7694942e8f748488e5601
--- 1/mod/photos.php
--- 2/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 3d16f8ca9ca4d3a7c12caea768af322ae505ecad,b15b954742af5a7dc6c749e02988434b218ae53c..958f4ba03b65bd831689d9cb4e1fba9bfd7c76b9
--- 1/mod/subthread.php
--- 2/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 4d93047e260ac6098fb2e9cdc87e2d54b0068f03,d6f421205cbfff1cb9e30eefae1bd16ebbb7ce30..b1f91d1bc403c3b78e1a6b11cde6baa02c7e81e2
--- 1/mod/tagger.php
--- 2/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']);