Show
Ignore:
Timestamp:
07/03/08 00:38:35 (17 months ago)
Author:
bchoate
Message:

Fixed column-based sort_by for authors tag. Added 'glue' attribute support for comments tag.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • branches/release-41/php/lib/block.mtcomments.php

    r2501 r2684  
    77 
    88function smarty_block_mtcomments($args, $content, &$ctx, &$repeat) { 
    9     $localvars = array('comments', 'comment_order_num','comment','current_timestamp', 'commenter', 'blog', 'blog_id', 'conditional', 'else_content'); 
     9    $localvars = array('comments', 'comment_order_num','comment','current_timestamp', 'commenter', 'blog', 'blog_id', 'conditional', 'else_content', '_comments_glue', '_comments_out'); 
    1010    if (!isset($content)) { 
    1111        $ctx->localize($localvars); 
     
    1919        $ctx->stash('comments', $comments); 
    2020        $counter = 0; 
     21        $out = false; 
     22        $ctx->stash('_comments_glue', $args['glue']); 
     23        $ctx->stash('_comments_out', false); 
    2124    } else { 
    2225        $comments = $ctx->stash('comments'); 
    2326        $counter = $ctx->stash('comment_order_num'); 
     27        $out = $ctx->stash('_comments_out'); 
    2428    } 
    2529 
     
    6367        $ctx->__stash['vars']['__first__'] = $count == 1; 
    6468        $ctx->__stash['vars']['__last__'] = ($count == count($comments)); 
     69 
     70        $glue = $ctx->stash('_comments_glue'); 
     71        if (isset($glue) && !empty($content)) { 
     72            if ($out) 
     73                $content = $glue . $content; 
     74            else 
     75                $ctx->stash('_comments_out', true); 
     76        } 
    6577    } else { 
     78        $glue = $ctx->stash('_comments_glue'); 
     79        if (isset($glue) && $out && !empty($content)) 
     80            $content = $glue . $content; 
    6681        $ctx->restore($localvars); 
    6782        $repeat = false; 
     
    6984    return $content; 
    7085} 
    71 ?>