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

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

@@ -7 +7 @@
 
 function smarty_block_mtassettags($args, $content, &$ctx, &$repeat) {
-    $localvars = array('_tags', 'Tag', '_tags_counter', 'tag_min_count', 'tag_max_count','all_tag_count');
+    $localvars = array('_tags', 'Tag', '_tags_counter', 'tag_min_count', 'tag_max_count','all_tag_count', '__out');
     if (!isset($content)) {
         $ctx->localize($localvars);
@@ -32 +32 @@
         if (!is_array($tags)) $tags = array();
         $ctx->stash('_tags', $tags);
+        $ctx->stash('__out', false);
         
         $counter = 0;
@@ -37 +38 @@
         $tags = $ctx->stash('_tags');
         $counter = $ctx->stash('_tags_counter');
+        $out = $ctx->stash('__out');
     }
     if ($counter < count($tags)) {
@@ -43 +45 @@
         $ctx->stash('_tags_counter', $counter + 1);
         $repeat = true;
-        if (($counter > 0) && isset($args['glue'])) {
-            $content = $content . $args['glue'];
+        if (isset($args['glue']) && !empty($content)) {
+            if ($out)
+                $content = $args['glue'] . $content;
+            else
+                $ctx->stash('__out', true);
         }
     } else {
+        if (isset($args['glue']) && $out && !empty($content))
+            $content = $args['glue'] . $content;
         $ctx->restore($localvars);
         $repeat = false;