From: Roland Haeder <roland@mxchange.org>
Date: Wed, 21 Dec 2016 19:01:51 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/develop' into rewrites/app_get_baseurl_static
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=0436782e70f496c96f30ee7822865f777ae1d73e;p=friendica.git

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

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

0436782e70f496c96f30ee7822865f777ae1d73e
diff --cc include/like.php
index 94ff33a699,e997e05d6b..feaffe011b
--- a/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 3fdb250b5c,736b44007f..e14f08570c
--- a/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();