From: Michael Vogel <icarus@dabo.de>
Date: Sun, 8 Jul 2018 04:35:50 +0000 (+0200)
Subject: Merge branch 'develop' into item-activities
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=ff5ee74ecfbd39b630433c6e1d7cfcd9611d4660;p=friendica.git

Merge branch 'develop' into item-activities
---

ff5ee74ecfbd39b630433c6e1d7cfcd9611d4660
diff --cc include/api.php
index 19d4a944d5,af6f54fe60..ad991485a4
--- a/include/api.php
+++ b/include/api.php
@@@ -1814,10 -1820,10 +1820,10 @@@ function api_statuses_show($type
  
  	logger('API: api_statuses_show: ' . $id);
  
- 	$conversation = (x($_REQUEST, 'conversation') ? 1 : 0);
+ 	$conversation = !empty($_REQUEST['conversation']);
  
  	// try to fetch the item for the local user - or the public item, if there is no local one
 -	$uri_item = dba::selectFirst('item', ['uri'], ['id' => $id]);
 +	$uri_item = Item::selectFirst(['uri'], ['id' => $id]);
  	if (!DBM::is_result($uri_item)) {
  		throw new BadRequestException("There is no status with this id.");
  	}