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

This commit is contained in:
Michael 2016-11-13 19:12:11 +00:00
commit 1aa9b7242d
4 changed files with 154 additions and 136 deletions

View file

@ -2876,8 +2876,10 @@ class diaspora {
"created_at" => $created,
"provider_display_name" => $item["app"]);
if (count($location) == 0)
// Diaspora rejects messages when they contain a location without "lat" or "lng"
if (!isset($location["lat"]) OR !isset($location["lng"])) {
unset($message["location"]);
}
$type = "status_message";
}