Fix "Invalid argument supplied for foreach()"

IlchCMS · Jan 5, 2019 · d9f6ff7 · d9f6ff7
1 parent c66815b
commit d9f6ff7
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/application/modules/away/mappers/Away.php b/application/modules/away/mappers/Away.php
@@ -26,7 +26,7 @@ public function getAway($where = [])
             ->fetchRows();
 
         if (empty($entryArray)) {
-            return null;
+            return [];
         }
 
         $away = [];
@@ -100,7 +100,8 @@ public function save(AwayModel $away)
      *
      * @param integer $start
      * @param integer $end
-     * @return AwayModel|null
+     * @return AwayModel[]|array|null
+     * @throws \Ilch\Database\Exception
      */
     public function getEntriesForJson($start, $end)
     {

diff --git a/application/modules/away/views/admin/index/index.php b/application/modules/away/views/admin/index/index.php
@@ -1,7 +1,7 @@
 <?php $userCache = $this->get('userCache') ?>
 
 <h1><?=$this->getTrans('manage') ?></h1>
-<?php if ($this->get('aways') != ''): ?>
+<?php if (!empty($this->get('aways'))): ?>
     <form class="form-horizontal" method="POST" action="">
         <?=$this->getTokenField() ?>
         <div class="table-responsive">

diff --git a/application/modules/away/views/index/index.php b/application/modules/away/views/index/index.php
@@ -24,7 +24,7 @@
                 <th colspan="3"><?=$this->getTrans('status') ?></th>
             </tr>
         </thead>
-        <?php if ($this->get('aways') != ''): ?>
+        <?php if (!empty($this->get('aways'))): ?>
             <form class="form-horizontal" method="POST" action="">
                 <?=$this->getTokenField() ?>
                 <tbody>