Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-29 13:44:23 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '2019.01-rc' into bug/6334-escape-get-app

Browse source
This commit is contained in:
Hypolite Petovan 2019-01-06 16:38:48 -05:00 • committed by GitHub
commit e447375cdd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
27 changed files with 136 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/Protocol/Diaspora.php
View file

@ -1326,15 +1326,8 @@ class Diaspora
$x = false;
}
// This will work for older Diaspora and Friendica servers
if (!$x) {
$source_url = $server."/p/".urlencode($guid).".xml";
Logger::log("Fetch post from ".$source_url, Logger::DEBUG);
$x = Network::fetchUrl($source_url);
if (!$x) {
return false;
}
return false;
}
$source_xml = XML::parseString($x);

2
src/Protocol/OStatus.php
View file

@ -1228,7 +1228,7 @@ class OStatus
{
$siteinfo = BBCode::getAttachedData($body);
if (($siteinfo["type"] == "photo")) {
if (($siteinfo["type"] == "photo") && (!empty($siteinfo["preview"]) || !empty($siteinfo["image"]))) {
if (isset($siteinfo["preview"])) {
$preview = $siteinfo["preview"];
} else {