Fixed issue: 13840: Login with local user gives a php7.2 warning

LimeSurvey · Jul 9, 2018 · f13c111 · f13c111
1 parent 340a9c6
commit f13c111
Showing 1 changed file with 13 additions and 12 deletions.
diff --git a/application/models/UpdateForm.php b/application/models/UpdateForm.php
@@ -580,18 +580,19 @@ public function getUpdateNotification()
                 $update_available = false;
                 if ($updates->result) {
                     unset($updates->result);
-
-                    if (count($updates) > 0) {
-                        $update_available = true;
-                        $security_update_available = false;
-                        $unstable_update_available = false;
-                        foreach ($updates as $update) {
-                            if ($update->security_update) {
-                                $security_update_available = true;
-                            }
-
-                            if ($update->branch != 'master') {
-                                $unstable_update_available = true;
+                    if (is_array($updates) || $updates instanceof Countable) {
+                        if (count($updates) > 0) {
+                            $update_available = true;
+                            $security_update_available = false;
+                            $unstable_update_available = false;
+                            foreach ($updates as $update) {
+                                if ($update->security_update) {
+                                    $security_update_available = true;
+                                }
+
+                                if ($update->branch != 'master') {
+                                    $unstable_update_available = true;
+                                }
                             }
                         }
                     }