Changeset 2684

Timestamp:

07/03/08 00:38:35 (20 months ago)

Author:

bchoate

Message:

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

Location:

branches/release-41

Files:

• lib/MT/Template/ContextHandlers.pm (modified) (4 diffs)
• php/lib/block.mtcomments.php (modified) (4 diffs)

branches/release-41/lib/MT/Template/ContextHandlers.pm

@@ -6267 +6267 @@
             $score_offset = delete($args->{offset}) || 0;
             $re_sort = 1;
+        } elsif (MT::Author->has_column($args->{sort_by})) {
+            $args{'sort'} = $args->{sort_by};
         }
     }
@@ -10133 +10135 @@
     local $ctx->{__stash}{commenter} = $ctx->{__stash}{commenter};
     my $vars = $ctx->{__stash}{vars} ||= {};
+    my $glue = $args->{glue};
     for my $c (@comments) {
         local $vars->{__first__} = $i == 1;
@@ -10153 +10156 @@
               CommentsFooter => ($i == scalar @comments), %$cond } );
         return $ctx->error( $builder->errstr ) unless defined $out;
+        $html .= $glue if defined $glue && length($html) && length($out);
         $html .= $out;
         $i++;
@@ -10454 +10458 @@
         my $root_url = $static_path . "images";
         $logo = "$root_url/nav-commenters.gif";
+    }
+    if ($logo =~ m!^/!) {
+        # relative path, prepend blog domain
+        my $blog = $ctx->stash('blog');
+        if ($blog) {
+            my ($blog_domain) = $blog->archive_url =~ m|(.+://[^/]+)|;
+            $logo = $blog_domain . $logo;
+        }
     }
     my $result = qq{<img alt=\"Author Profile Page\" src=\"$logo\" width=\"16\" height=\"16\" />};

branches/release-41/php/lib/block.mtcomments.php

@@ -7 +7 @@
 
 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 +19 @@
         $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 +67 @@
         $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 +84 @@
     return $content;
 }
-?>