clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

More usage of dbm::is_result($r) instead of count($r):

Browse Source 
- count() returns very different results and never a boolean (not even false on
  error condition).
- therefore you should NOT use it in boolean expressions. This still *can* be
  done in PHP because of its lazyness. But it is discouraged if it comes to
  more clean code.

Signed-off-by: Roland Häder <roland@mxchange.org>
This commit is contained in:
Roland Häder
2016-12-13 10:44:13 +01:00
parent 293436e5fd
commit 6a8a36f12d
115 changed files with 439 additions and 437 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mod/pubsub.php
View File

@@ -47,7 +47,7 @@ function pubsub_init(&$a) {
$r = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `account_expired` = 0 AND `account_removed` = 0 LIMIT 1",
dbesc($nick)
);
if(! count($r)) {
if(! dbm::is_result($r)) {
logger('pubsub: local account not found: ' . $nick);
hub_return(false, '');
}
@@ -62,7 +62,7 @@ function pubsub_init(&$a) {
intval($contact_id),
intval($owner['uid'])
);
if(! count($r)) {
if(! dbm::is_result($r)) {
logger('pubsub: contact '.$contact_id.' not found.');
hub_return(false, '');
}
@@ -117,7 +117,7 @@ function pubsub_post(&$a) {
$r = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `account_expired` = 0 AND `account_removed` = 0 LIMIT 1",
dbesc($nick)
);
if(! count($r))
if(! dbm::is_result($r))
hub_post_return();
$importer = $r[0];
@@ -131,7 +131,7 @@ function pubsub_post(&$a) {
dbesc(NETWORK_FEED)
);
if(! count($r)) {
if(! dbm::is_result($r)) {
logger('pubsub: no contact record for "'.$nick.' ('.$contact_id.')" - ignored. '.$xml);
hub_post_return();
}