Changeset 1926 for branches/release-35/php/lib/block.mtloop.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.mtloop.php (modified) (4 diffs)

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

@@ -7 +7 @@
 
 function smarty_block_mtloop($args, $content, &$ctx, &$repeat) {
-    $localvars = array('__loop_keys', '__loop_values');
+    $localvars = array('__loop_keys', '__loop_values', '__out');
 
     if (!isset($content)) {
@@ -67 +67 @@
         $counter = 1;
         $ctx->stash('__loop_values', $value);
+        $ctx->stash('__out', false);
     }
     else {
@@ -72 +73 @@
         $keys = $ctx->stash('__loop_keys');
         $value = $ctx->stash('__loop_values');
+        $out = $ctx->stash('__out');
         if (!isset($keys) || $keys == 0) {
             $ctx->restore($localvars);
             $repeat = false;
+            if (isset($args['glue']) && $out && !empty($content))
+                $content = $args['glue'] . $content;
             return $content;
         }
@@ -97 +101 @@
         }
     }
-    if (array_key_exists('glue', $args)) {
-        if (1 < $counter)
-            $content = $content . $args['glue'];
+    if (isset($args['glue']) && !empty($content)) {
+        if ($out)
+            $content = $args['glue'] . $content;
+        else
+            $ctx->stash('__out', true);
     }
     if ( 0 === count($keys) )