Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-26 14:30:13 +00:00
Code Issues Projects Releases Packages 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

14
include/notifier.php
View file

@ -170,7 +170,7 @@ function notifier_run(&$argv, &$argc){
intval($item_id)
);
if((! count($r)) || (! intval($r[0]['parent']))) {
if((! dbm::is_result($r)) || (! intval($r[0]['parent']))) {
return;
}
@ -210,7 +210,7 @@ function notifier_run(&$argv, &$argc){
intval($uid)
);
if(! count($r))
if(! dbm::is_result($r))
return;
$owner = $r[0];
@ -321,7 +321,7 @@ function notifier_run(&$argv, &$argc){
intval($uid),
dbesc(NETWORK_DFRN)
);
if(count($r))
if(dbm::is_result($r))
foreach($r as $rr)
$recipients_followup[] = $rr['id'];
}
@ -445,7 +445,7 @@ function notifier_run(&$argv, &$argc){
$r = q("SELECT * FROM `contact` WHERE `id` IN ($conversant_str) AND NOT `blocked` AND NOT `pending` AND NOT `archive`".$sql_extra);
if(count($r))
if(dbm::is_result($r))
$contacts = $r;
} else
@ -463,7 +463,7 @@ function notifier_run(&$argv, &$argc){
intval($uid),
dbesc(NETWORK_MAIL)
);
if(count($r)) {
if(dbm::is_result($r)) {
foreach($r as $rr)
$recipients[] = $rr['id'];
}
@ -491,7 +491,7 @@ function notifier_run(&$argv, &$argc){
// delivery loop
if(count($r)) {
if(dbm::is_result($r)) {
foreach($r as $contact) {
if(!$contact['self']) {
@ -592,7 +592,7 @@ function notifier_run(&$argv, &$argc){
$r = array_merge($r2,$r1,$r0);
if(count($r)) {
if(dbm::is_result($r)) {
logger('pubdeliver '.$target_item["guid"].': '.print_r($r,true), LOGGER_DEBUG);
// throw everything into the queue in case we get killed