friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

PHP5 does not support native type-hints, except `array` + used dbm::is_result() 

Signed-off-by: Roland Haeder <roland@mxchange.org>
This commit is contained in:
Roland Häder 2017-03-25 13:37:15 +01:00
parent 83dec2f815
commit 6d5826e188
No known key found for this signature in database
GPG Key ID: B72F8185C6C7BD78
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
include/dfrn.php
View File

@ -216,13 +216,10 @@ class dfrn {
dbesc($sort) dbesc($sort)
); );
if (!dbm::is_result($r)) { /*
/// @TODO Some logging? * Will check further below if this actually returned results.
killme(); * We will provide an empty feed if that is the case.
} */
// Will check further below if this actually returned results.
// We will provide an empty feed if that is the case.
$items = $r; $items = $r;
@ -243,10 +240,10 @@ class dfrn {
$root = self::add_header($doc, $owner, $author, $alternatelink, true); $root = self::add_header($doc, $owner, $author, $alternatelink, true);
// This hook can't work anymore /// @TODO This hook can't work anymore
// call_hooks('atom_feed', $atom); // call_hooks('atom_feed', $atom);
if (!count($items) OR $onlyheader) { if (!dbm::is_result($items) OR $onlyheader) {
$atom = trim($doc->saveXML()); $atom = trim($doc->saveXML());
call_hooks('atom_feed_end', $atom); call_hooks('atom_feed_end', $atom);