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

Signed-off-by: Roland Haeder <roland@mxchange.org>

diff --cc include/like.php
index 94ff33a6996f4dd204993923117d9e17fe072fa1,e997e05d6b0e43601d6924dd1bf23ebec532915c..feaffe011b7ec7842e24acd1054701fe0e45630d
--- 1/include/like.php
--- 2/include/like.php
+++ b/include/like.php
@@@ -164,11 -161,10 +164,10 @@@ function do_like($item_id, $verb) 
        $uri = item_new_uri($a->get_hostname(),$owner_uid);
  
        $post_type = (($item['resource-id']) ? t('photo') : t('status'));
 -      if($item['object-type'] === ACTIVITY_OBJ_EVENT)
 +      if ($item['object-type'] === ACTIVITY_OBJ_EVENT) {
                $post_type = t('event');
-       }
        $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/proxy.php
index 3fdb250b5ceb02362b45b4a9a0238ddfbf3d3f64,736b44007f0627d3f36822820de5c1e03ee738c5..e14f08570c377ce8ed96e7f8ef7380747e132234
--- 1/mod/proxy.php
--- 2/mod/proxy.php
+++ b/mod/proxy.php
@@@ -140,17 -140,11 +140,23 @@@ function proxy_init(App $a) 
        if (!$direct_cache AND ($cachefile == '')) {
                $r = qu("SELECT * FROM `photo` WHERE `resource-id` = '%s' LIMIT 1", $urlhash);
                if (dbm::is_result($r)) {
++<<<<<<< HEAD
 +<<<<<<< origin/rewrites/app_get_baseurl_static
 +                      $img_str = $r[0]['data'];
 +                      $mime = $r[0]["desc"];
 +                      if ($mime == "") $mime = "image/jpeg";
 +=======
++=======
++>>>>>>> upstream/develop
                        $img_str = $r[0]['data'];
                        $mime = $r[0]['desc'];
                        if ($mime == '') {
                                $mime = 'image/jpeg';
                        }
++<<<<<<< HEAD
 +>>>>>>> HEAD~0
++=======
++>>>>>>> upstream/develop
                }
        } else {
                $r = array();