diff --git a/libs/sysplugins/smarty_internal_compile_foreach.php b/libs/sysplugins/smarty_internal_compile_foreach.php
index 78b45ea7e..6a23f9244 100644
--- a/libs/sysplugins/smarty_internal_compile_foreach.php
+++ b/libs/sysplugins/smarty_internal_compile_foreach.php
@@ -150,7 +150,7 @@ public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
             if ($this->isNamed) {
                 foreach ($match[ 1 ] as $prop) {
                     if (in_array($prop, $this->nameProperties)) {
-                        $nameAttr[ $prop ] = true;
+                        $namedAttr[ $prop ] = true;
                     } else {
                         $compiler->trigger_template_error("Invalid property '{$prop}'", null, true);
                     }
@@ -187,7 +187,6 @@ public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
         if ($this->isNamed) {
             $foreachVar = "\$_smarty_tpl->tpl_vars['__smarty_foreach_{$attributes['name']}']";
         }
-        $needTotal = isset($itemAttr[ 'total' ]);
         // Register tag
         $this->openTag(
             $compiler,
@@ -200,9 +199,6 @@ public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
         $output = "<?php\n";
         $output .= "\$_from = \$_smarty_tpl->smarty->ext->_foreach->init(\$_smarty_tpl, $from, " .
                    var_export($item, true);
-        if ($name || $needTotal || $key) {
-            $output .= ', ' . var_export($needTotal, true);
-        }
         if ($name || $key) {
             $output .= ', ' . var_export($key, true);
         }
@@ -211,7 +207,7 @@ public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
         }
         $output .= ");\n";
         if (isset($itemAttr[ 'show' ])) {
-            $output .= "{$itemVar}->show = ({$itemVar}->total > 0);\n";
+            $output .= "{$itemVar}->show = ({$itemVar}->total == -1) || ({$itemVar}->total > 0);\n";
         }
         if (isset($itemAttr[ 'iteration' ])) {
             $output .= "{$itemVar}->iteration = 0;\n";
@@ -219,7 +215,6 @@ public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
         if (isset($itemAttr[ 'index' ])) {
             $output .= "{$itemVar}->index = -1;\n";
         }
-        $output .= "if (\$_from !== null) {\n";
         $output .= "foreach (\$_from as {$keyTerm}{$itemVar}->value) {\n";
         if (isset($attributes[ 'key' ]) && isset($itemAttr[ 'key' ])) {
             $output .= "\$_smarty_tpl->tpl_vars['{$key}']->value = {$itemVar}->key;\n";
@@ -296,7 +291,8 @@ public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
         if ($restore === 2) {
             $output .= "{$itemVar} = {$local}saved;\n";
         }
-        $output .= "}\n} else {\n?>";
+        $output .= "}\n";
+        $output .= "if ({$itemVar}->index == -1) {\n?>";
         return $output;
     }
 }
@@ -332,9 +328,6 @@ public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
         if ($restore === 2) {
             $output .= "{$itemVar} = {$local}saved;\n";
         }
-        if ($restore > 0) {
-            $output .= "}\n";
-        }
         $output .= "}\n";
         /* @var Smarty_Internal_Compile_Foreach $foreachCompiler */
         $foreachCompiler = $compiler->getTagCompiler('foreach');
diff --git a/libs/sysplugins/smarty_internal_runtime_foreach.php b/libs/sysplugins/smarty_internal_runtime_foreach.php
index badead165..7cc7bb3ac 100644
--- a/libs/sysplugins/smarty_internal_runtime_foreach.php
+++ b/libs/sysplugins/smarty_internal_runtime_foreach.php
@@ -36,25 +36,21 @@ public function init(
         Smarty_Internal_Template $tpl,
         $from,
         $item,
-        $needTotal = false,
         $key = null,
         $name = null,
         $properties = array()
     ) {
-        $needTotal = $needTotal || isset($properties[ 'total' ]);
         $saveVars = array();
         $total = null;
         if (!is_array($from)) {
             if (is_object($from)) {
-                if ($needTotal) {
-                    $total = $this->count($from);
-                }
+                $total = $this->count($from);
             } else {
                 settype($from, 'array');
             }
         }
         if (!isset($total)) {
-            $total = empty($from) ? 0 : ($needTotal ? count($from) : 1);
+            $total = empty($from) ? 0 : count($from);
         }
         if (isset($tpl->tpl_vars[ $item ])) {
             $saveVars[ 'item' ] = array(
@@ -63,9 +59,7 @@ public function init(
             );
         }
         $tpl->tpl_vars[ $item ] = new Smarty_Variable(null, $tpl->isRenderingCache);
-        if ($total === 0) {
-            $from = null;
-        } else {
+        if ($total !== 0) {
             if ($key) {
                 if (isset($tpl->tpl_vars[ $key ])) {
                     $saveVars[ 'key' ] = array(
@@ -76,9 +70,7 @@ public function init(
                 $tpl->tpl_vars[ $key ] = new Smarty_Variable(null, $tpl->isRenderingCache);
             }
         }
-        if ($needTotal) {
-            $tpl->tpl_vars[ $item ]->total = $total;
-        }
+        $tpl->tpl_vars[ $item ]->total = $total;
         if ($name) {
             $namedVar = "__smarty_foreach_{$name}";
             if (isset($tpl->tpl_vars[ $namedVar ])) {
@@ -98,7 +90,7 @@ public function init(
                 $namedProp[ 'index' ] = -1;
             }
             if (isset($properties[ 'show' ])) {
-                $namedProp[ 'show' ] = ($total > 0);
+                $namedProp[ 'show' ] = ($total = -1) || ($total > 0);
             }
             $tpl->tpl_vars[ $namedVar ] = new Smarty_Variable($namedProp);
         }
@@ -116,18 +108,16 @@ public function init(
      */
     public function count($value)
     {
-        if ($value instanceof IteratorAggregate) {
-            // Note: getIterator() returns a Traversable, not an Iterator
-            // thus rewind() and valid() methods may not be present
-            return iterator_count($value->getIterator());
-        } elseif ($value instanceof Iterator) {
-            return $value instanceof Generator ? 1 : iterator_count($value);
-        } elseif ($value instanceof Countable) {
+        if ($value instanceof Countable) {
             return count($value);
         } elseif ($value instanceof PDOStatement) {
             return $value->rowCount();
+        } elseif ($value instanceof Iterator) {
+            return $value instanceof Generator ? 1 : -1;
         } elseif ($value instanceof Traversable) {
-            return iterator_count($value);
+            return -1;
+        } elseif ($value instanceof IteratorAggregate) {
+            return -1;
         }
         return count((array)$value);
     }