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

Timestamp:

04/16/08 10:50:21 (19 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.mttags.php (modified) (3 diffs)

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

@@ -7 +7 @@
 
 function smarty_block_mttags($args, $content, &$ctx, &$repeat) {
-    $localvars = array('_tags', 'Tag', '_tags_counter', 'tag_min_count', 'tag_max_count', 'all_tag_count', 'include_blogs', 'exclude_blogs', 'blog_ids');
+  $localvars = array('_tags', 'Tag', '_tags_counter', 'tag_min_count', 'tag_max_count', 'all_tag_count', 'include_blogs', 'exclude_blogs', 'blog_ids', '__out');
     if (!isset($content)) {
         $ctx->localize($localvars);
@@ -54 +54 @@
         $ctx->stash('all_tag_count', $all_count);
         $ctx->stash('_tags', $tags);
+        $ctx->stash('__out', false);
         $counter = 0;
     } else {
         $tags = $ctx->stash('_tags');
         $counter = $ctx->stash('_tags_counter');
+        $out = $ctx->stash('__out');
     }
 
@@ -65 +67 @@
         $ctx->stash('_tags_counter', $counter + 1);
         $repeat = true;
-        if (($counter > 0) && isset($args['glue'])) {
-            $content = $content . $args['glue'];
+        if (isset($args['glue'])) {
+            if ($out && !empty($content))
+                $content = $args['glue'] . $content;
+            if (!$out && !empty($content))
+              $ctx->stash('__out', true);
         }
     } else {
+        if (isset($args['glue'])) {
+            if ($out && !empty($content))
+                $content = $args['glue'] . $content;
+        }
         $ctx->restore($localvars);
         $repeat = false;