Merge remote-tracking branch 'origin/master'

IlchCMS · Feb 8, 2019 · 00027e0 · 00027e0
2 parents 70901ed + 7fe33e0
commit 00027e0
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/application/modules/admin/views/admin/layouts/search.php b/application/modules/admin/views/admin/layouts/search.php
@@ -36,7 +36,7 @@
                 <a href="<?=$this->getUrl(['action' => 'show', 'id' => $layoutOnUpdateServer->id]); ?>" title="<?=$this->getTrans('info') ?>">
                     <img src="<?=$this->get('updateserver').'layouts/images/'.$layoutOnUpdateServer->thumbs[0]->img ?>" alt="<?=$this->escape($layoutOnUpdateServer->name) ?>" />
                 </a>
-                <?=($layoutOnUpdateServer->official) ? '<span class="ilch-official">ilch</span>' : '' ?>
+                <?=(!empty($layoutOnUpdateServer->official) && $layoutOnUpdateServer->official) ? '<span class="ilch-official">ilch</span>' : '' ?>
             </div>
             <div class="panel-footer">
                 <div class="clearfix">

diff --git a/application/modules/admin/views/admin/modules/index.php b/application/modules/admin/views/admin/modules/index.php
@@ -186,7 +186,7 @@ class="btn btn-default"
                         <td><?=$module->getVersion() ?></td>
                         <td>
                             <?=$content['description'] ?>
-                            <?=($moduleUpdateInformation->official) ? '<span class="ilch-official">ilch</span>' : '' ?>
+                            <?=(!empty($moduleUpdateInformation->official) && $moduleUpdateInformation->official) ? '<span class="ilch-official">ilch</span>' : '' ?>
                         </td>
                     </tr>
 

diff --git a/application/modules/admin/views/admin/modules/search.php b/application/modules/admin/views/admin/modules/search.php
@@ -169,7 +169,7 @@ class="btn btn-default"
                     <td><?=$moduleOnUpdateServer->version?></td>
                     <td>
                         <?=$moduleOnUpdateServer->desc ?>
-                        <?=($moduleOnUpdateServer->official) ? '<span class="ilch-official">ilch</span>' : '' ?>
+                        <?=(!empty($moduleOnUpdateServer->official) && $moduleOnUpdateServer->official) ? '<span class="ilch-official">ilch</span>' : '' ?>
                     </td>
                 </tr>
                 <?php

diff --git a/application/modules/admin/views/admin/modules/updates.php b/application/modules/admin/views/admin/modules/updates.php
@@ -194,7 +194,7 @@ class="btn btn-default"
                         <td><?=$module->getVersion() ?></td>
                         <td>
                             <?=$content['description'] ?>
-                            <?=($moduleUpdateInformation->official) ? '<span class="ilch-official">ilch</span>' : '' ?>
+                            <?=(!empty($moduleUpdateInformation->official) && $moduleUpdateInformation->official) ? '<span class="ilch-official">ilch</span>' : '' ?>
                         </td>
                     </tr>