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

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

@@ -9 +9 @@
     // status: incomplete
     // parameters: show_empty
-    $localvars = array('_categories', '_categories_counter', 'category', 'inside_mt_categories', 'entries', '_categories_glue', 'blog_id', 'blog');
+    $localvars = array('_categories', '_categories_counter', 'category', 'inside_mt_categories', 'entries', '_categories_glue', 'blog_id', 'blog', '__out');
     if (!isset($content)) {
         $ctx->localize($localvars);
@@ -19 +19 @@
         $ctx->stash('inside_mt_categories', 1);
         $ctx->stash('show_empty', isset($args['show_empty']) ? $args['show_empty'] : '0');
+        $ctx->stash('__out', false);
         $counter = 0;
     } else {
@@ -24 +25 @@
         $counter = $ctx->stash('_categories_counter');
         $glue = $ctx->stash('_categories_glue');
+        $out =$ctx->stash('__out');
     }
     if ($counter < count($categories)) {
@@ -35 +37 @@
         $ctx->stash('blog',
             $ctx->mt->db->fetch_blog($category['category_blog_id']));
-        if ($counter > 0) $content = $content . $glue;
+        if (!empty($glue) && !empty($content)) {
+            if ($out)
+                $content = $glue . $content;
+            else
+                $ctx->stash('__out', true);
+        }
         $repeat = true;
     } else {
+        if (!empty($glue) && $out && !empty($content))
+            $content = $glue . $content;
         $ctx->restore($localvars);
         $repeat = false;