Changeset 1926 for branches/release-35/php/lib/block.mtfor.php

Timestamp:

04/16/08 10:50:21 (20 months ago)

Author:

takayama

Message:

Fixed BugId:76389
* Loop tags does not add 'glue', if row in loop tag was empty

• MTFor
• MTLoop
• MTTags
• MTEntryTags
• MTEntries
• MTEntryCategories
• MTCategories
• MTEntryAdditionalCategories
• MTParentCategories
• MTAssetTags
• MTPagerBlock

Files:

• branches/release-35/php/lib/block.mtfor.php (modified) (4 diffs)

branches/release-35/php/lib/block.mtfor.php

@@ -7 +7 @@
 
 function smarty_block_mtfor($args, $content, &$ctx, &$repeat) {
-    $localvars = array('__for_end', '__for_var');
+    $localvars = array('__for_end', '__for_var', '__out');
 
     if (!isset($content)) {
@@ -30 +30 @@
         $ctx->stash('__for_end', $end);
         $ctx->stash('__for_var', $var);
+        $ctx->stash('__out', false);
     } else {
         $index = $ctx->__stash['vars']['__index__'] + 1;
@@ -35 +36 @@
         $end = $ctx->stash('__for_end');
         $var = $ctx->stash('__for_var');
+        $out = $ctx->stash('__out');
     }
 
@@ -46 +48 @@
         if ($var)
             $ctx->__stash['vars'][$var] = $index;
-        if (array_key_exists('glue', $args)) {
-            if ($index < $end)
-                $content = $content . $args['glue'];
+        if (isset($args['glue']) && !empty($content)) {
+            if ($out)
+                $content = $args['glue'] . $content;
+            else
+                $ctx->stash('__out', true);
         }
         $repeat = true;
     } else {
+        if (isset($args['glue']) && $out && !empty($content))
+            $content = $args['glue'] . $content;
         $ctx->restore($localvars);
         $repeat = false;