strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #5761 from annando/endless

Browse source 
The endless saga of the fight against notices continues
This commit is contained in:
Hypolite Petovan 2018-09-14 00:36:42 -04:00 committed by GitHub
commit 79d36b932b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mod/fetch.php
View file

@ -25,7 +25,7 @@ function fetch_init(App $a)
// Fetch the item
$fields = ['uid', 'title', 'body', 'guid', 'contact-id', 'private', 'created', 'app', 'location', 'coord', 'network',
'event-id', 'resource-id', 'author-link', 'owner-link', 'attach'];
'event-id', 'resource-id', 'author-link', 'author-avatar', 'author-name', 'plink', 'owner-link', 'attach'];
$condition = ['wall' => true, 'private' => false, 'guid' => $guid, 'network' => [Protocol::DFRN, Protocol::DIASPORA]];
$item = Item::selectFirst($fields, $condition);
if (!DBA::isResult($item)) {

2
src/Protocol/Diaspora.php
View file

@ -3496,7 +3496,7 @@ class Diaspora
$myaddr = self::myHandle($owner);
$public = (($item["private"]) ? "false" : "true");
$public = ($item["private"] ? "false" : "true");
$created = DateTimeFormat::utc($item["created"], DateTimeFormat::ATOM);

8
src/Util/ParseUrl.php
View file

@ -486,21 +486,23 @@ class ParseUrl
$complete = $schemearr["scheme"]."://".$schemearr["host"];
if (@$schemearr["port"] != "") {
if (!empty($schemearr["port"])) {
$complete .= ":".$schemearr["port"];
}
if (!empty($urlarr["path"])) {
if (strpos($urlarr["path"], "/") !== 0) {
$complete .= "/";
}
$complete .= $urlarr["path"];
}
if (@$urlarr["query"] != "") {
if (!empty($urlarr["query"])) {
$complete .= "?".$urlarr["query"];
}
if (@$urlarr["fragment"] != "") {
if (!empty($urlarr["fragment"])) {
$complete .= "#".$urlarr["fragment"];
}