Merge pull request #18 from ggoffy/master

updates for smarty3

Author: ggoffy

admin/items.php

@@ -59,7 +59,6 @@
         // Table view items
         if ($itemsCount > 0) {
             foreach (\array_keys($itemsAll) as $i) {
-                $item = [];
                 $item = $itemsAll[$i]->getValuesItems();
                 switch ((int)$itemsAll[$i]->getVar('item_type')) {
                     case Constants::TYPE_PHP:

templates/admin/wgblocks_admin_clone.tpl

@@ -1,13 +1,13 @@
 <!-- Header -->
 <{include file='db:wgblocks_admin_header.tpl' }>
 
-<{if $form|default:''}>
+<{if isset($form)}>
     <{$form|default:false}>
 <{/if}>
 <{if $result|default:''}>
     <{$result|default:false}>
 <{/if}>
-<{if $error|default:''}>
+<{if isset($error)}>
     <div class="errorMsg"><strong><{$error|default:false}></strong></div>
 <{/if}>
 

templates/admin/wgblocks_admin_header.tpl

@@ -1,6 +1,6 @@
 <div class='top'>
     <span class='left'><{$navigation|default:false}></span>
-    <{if $buttons|default:''}>
+    <{if isset($buttons)}>
         <span class='left'><{$buttons|default:false}></span>
     <{/if}>
 </div>

templates/admin/wgblocks_admin_items.tpl

@@ -1,7 +1,7 @@
 <!-- Header -->
 <{include file='db:wgblocks_admin_header.tpl' }>
 
-<{if $items_list|default:''}>
+<{if isset($items_list)}>
     <table class='table table-bordered'>
         <thead>
             <tr class='head'>
@@ -19,7 +19,7 @@
                 <th class="center width5"><{$smarty.const._AM_WGBLOCKS_FORM_ACTION}></th>
             </tr>
         </thead>
-        <{if $items_count|default:''}>
+        <{if isset($items_count)}>
         <tbody>
             <{foreach item=item from=$items_list}>
             <tr class='<{cycle values='odd, even'}>'>
@@ -28,14 +28,14 @@
                 <td class='center'><{$item.name}></td>
                 <td class='center'><{$item.text_short}></td>
                 <td class='center'>
-                    <{if $item.file_check}>
+                    <{if isset($item.file_check) && $item.file_check != ''}>
                         <img src="<{$wgblocks_icons_url_16}>/<{$item.file_check}>">
                     <{/if}>
-                    <{$item.file}>
+                    <{$item.file|default:''}>
                 </td>
                 <td class='center'>
-                    <{if $item.func_check}><img src="<{$wgblocks_icons_url_16}>/<{$item.func_check}>"><{/if}>
-                    <{$item.func}>
+                    <{if isset($item.func_check) && $item.func_check != ''}><img src="<{$wgblocks_icons_url_16}>/<{$item.func_check}>"><{/if}>
+                    <{$item.func|default:''}>
                 </td>
                 <td class='center'><{$item.weight}></td>
                 <td class='center'>
@@ -55,15 +55,15 @@
         <{/if}>
     </table>
     <div class="clear">&nbsp;</div>
-    <{if $pagenav|default:''}>
+    <{if isset($pagenav)}>
         <div class="xo-pagenav floatright"><{$pagenav|default:false}></div>
         <div class="clear spacer"></div>
     <{/if}>
 <{/if}>
-<{if $form|default:''}>
+<{if isset($form)}>
     <{$form|default:false}>
 <{/if}>
-<{if $error|default:''}>
+<{if isset($error)}>
     <div class="errorMsg"><strong><{$error|default:false}></strong></div>
 <{/if}>
 

templates/blocks/wgblocks_block_items.tpl

@@ -1,6 +1,6 @@
 <ul class="nav nav-pills nav-stacked">
     <{foreach item=item from=$block|default:''}>
-        <li class="li-wgblocks <{if $item.highlight|default:false}>active<{/if}>">
+        <li class="li-wgblocks <{if isset($item.highlight) && $item.highlight}>active<{/if}>">
             <{$item.content}>
         </li>
     <{/foreach}>