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

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

@@ -21 +21 @@
 
 function smarty_block_mtparentcategories($args, $content, &$ctx, &$repeat) {
-    $localvars = array('_categories', 'category', '_categories_counter','glue');
+    $localvars = array('_categories', 'category', '_categories_counter','glue', '__out');
     if (!isset($content)) {
         $ctx->localize($localvars);
@@ -39 +39 @@
         $ctx->stash('_categories', $parents);
         $ctx->stash('glue', $glue);
+        $ctx->stash('__out', false);
         $counter = 0;
     } else {
@@ -44 +45 @@
         $counter = $ctx->stash('_categories_counter');
         $glue = $ctx->stash('glue');
+        $out = $ctx->stash('__out');
     }
 
@@ -50 +52 @@
         $ctx->stash('_categories_counter', $counter + 1);
         $repeat = true;
+        if (!empty($glue) && !empty($content)) {
+            if ($out)
+                $content = $glue . $content;
+            else
+                $ctx->stash('__out', true);
+        }
     } else {
+        if (!empty($glue) && $out && !empty($content))
+            $content = $glue . $content;
         $repeat = false;
         $glue = '';
         $ctx->restore($localvars);
     }
-    return $content.$glue;
+    return $content;
 }
 ?>