More calls replaced with is_filled_array(), ticket #2390

Signed-off-by: Roland Haeder <roland@mxchange.org>

diff --git a/boot.php b/boot.php
index bf98cf5c3af9640500c601cfadf465fddfe3d3d7..b049099ea8078f8b24942787325bbf5e135d1a71 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -926,7 +926,7 @@ class App {
                } else {
                        $r = q("SELECT `contact`.`avatar-date` AS picdate FROM `contact` WHERE `contact`.`thumb` like '%%/%s'",
                                $common_filename);
-                       if(! count($r)){
+                       if(! is_filled_array($r)){
                                $this->cached_profile_image[$avatar_image] = $avatar_image;
                        } else {
                                $this->cached_profile_picdate[$common_filename] = "?rev=".urlencode($r[0]['picdate']);
@@ -1352,7 +1352,7 @@ function run_update_function($x) {
 function check_plugins(&$a) {
 
        $r = q("SELECT * FROM `addon` WHERE `installed` = 1");
-       if(count($r))
+       if(is_filled_array($r))
                $installed = $r;
        else
                $installed = array();
@@ -1680,7 +1680,7 @@ function current_theme(){
                $r = q("select theme from user where uid = %d limit 1",
                        intval($a->profile_uid)
                );
-               if($r)
+               if(is_filled_array($r))
                        $page_theme = $r[0]['theme'];
        }
 
@@ -1793,7 +1793,7 @@ function feed_birthday($uid,$tz) {
                        intval($uid)
        );
 
-       if($p && count($p)) {
+       if(is_filled_array($p)) {
                $tmp_dob = substr($p[0]['dob'],5);
                if(intval($tmp_dob)) {
                        $y = datetime_convert($tz,$tz,'now','Y');
@@ -1838,7 +1838,7 @@ function load_contact_links($uid) {
        $r = q("SELECT `id`,`network`,`url`,`thumb`, `rel` FROM `contact` WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 AND `thumb` != ''",
                        intval($uid)
        );
-       if(count($r)) {
+       if(is_filled_array($r)) {
                foreach($r as $rr){
                        $url = normalise_link($rr['url']);
                        $ret[$url] = $rr;

diff --git a/index.php b/index.php
index e364389b2cf36ada83138e23c1c3da8f1c9ca82a..e03d38a0c2325bab9fce01b17b99068c83e76268 100644 (file)
--- a/index.php
+++ b/index.php
@@ -107,7 +107,7 @@ if (x($_SESSION,'authenticated') && !x($_SESSION,'language')) {
        // we didn't loaded user data yet, but we need user language
        $r = q("SELECT language FROM user WHERE uid=%d", intval($_SESSION['uid']));
        $_SESSION['language'] = $lang;
-       if (count($r)>0) $_SESSION['language'] = $r[0]['language'];
+       if (is_filled_array($r)) $_SESSION['language'] = $r[0]['language'];
 }
 
 if((x($_SESSION,'language')) && ($_SESSION['language'] !== $lang)) {