Index: branches/release-41/php/lib/block.mtcomments.php
===================================================================
--- branches/release-41/php/lib/block.mtcomments.php (revision 2501)
+++ branches/release-41/php/lib/block.mtcomments.php (revision 2684)
@@ -7,5 +7,5 @@
 
 function smarty_block_mtcomments($args, $content, &$ctx, &$repeat) {
-    $localvars = array('comments', 'comment_order_num','comment','current_timestamp', 'commenter', 'blog', 'blog_id', 'conditional', 'else_content');
+    $localvars = array('comments', 'comment_order_num','comment','current_timestamp', 'commenter', 'blog', 'blog_id', 'conditional', 'else_content', '_comments_glue', '_comments_out');
     if (!isset($content)) {
         $ctx->localize($localvars);
@@ -19,7 +19,11 @@
         $ctx->stash('comments', $comments);
         $counter = 0;
+        $out = false;
+        $ctx->stash('_comments_glue', $args['glue']);
+        $ctx->stash('_comments_out', false);
     } else {
         $comments = $ctx->stash('comments');
         $counter = $ctx->stash('comment_order_num');
+        $out = $ctx->stash('_comments_out');
     }
 
@@ -63,5 +67,16 @@
         $ctx->__stash['vars']['__first__'] = $count == 1;
         $ctx->__stash['vars']['__last__'] = ($count == count($comments));
+
+        $glue = $ctx->stash('_comments_glue');
+        if (isset($glue) && !empty($content)) {
+            if ($out)
+                $content = $glue . $content;
+            else
+                $ctx->stash('_comments_out', true);
+        }
     } else {
+        $glue = $ctx->stash('_comments_glue');
+        if (isset($glue) && $out && !empty($content))
+            $content = $glue . $content;
         $ctx->restore($localvars);
         $repeat = false;
@@ -69,3 +84,2 @@
     return $content;
 }
-?>