Changeset 1710

Timestamp:

04/02/08 06:52:31 (23 months ago)

Author:

fumiakiy

Message:

Comment reply should not have assumed the existence of template modules even if it was one of default templates. BugId:67976

Location:

branches/release-33

Files:

• lib/MT/CMS/Comment.pm (modified) (3 diffs)
• tmpl/cms/dialog/comment_reply.tmpl (modified) (1 diff)
• tmpl/cms/include/comment_detail.tmpl (added)

branches/release-33/lib/MT/CMS/Comment.pm

@@ -1261 +1261 @@
       unless $comment;
 
-    my $cmt_tmpl =
-      $app->model('template')->load( { identifier => 'comment_detail' } );
-    my $tmpl_name = $cmt_tmpl->name;
-    require MT::Template;
-    my $tmpl = MT::Template->new(
-        type   => 'scalarref',
-        source => \"<\$MTInclude module=\"$tmpl_name\"\$>",
-    );
-    my $ctx = $tmpl->context;
     ## Set timestamp as we would usually do in ObjectDriver.
     my @ts = MT::Util::offset_time_list( time, $entry->blog_id );
@@ -1276 +1267 @@
     $comment->created_on($ts);
     $comment->commenter_id( $app->user->id );
-    $ctx->stash( 'comment', $comment );
+    $param->{'comment'} = $comment;
 
     require MT::Serialize;
@@ -1282 +1273 @@
     my $state = $comment->column_values;
     $state->{static} = $q->param('static');
-    $ctx->stash( 'comment_state', unpack 'H*', $ser->serialize( \$state ) );
-    $ctx->stash( 'comment_is_static', 1 );
-    $ctx->stash( 'entry',             $entry );
-    $ctx->{current_timestamp} = $ts;
-    $ctx->stash( 'commenter', $app->user );
-    $ctx->stash( 'blog_id',   $parent->blog_id );
-    $ctx->stash( 'blog',      $parent->blog );
-    my %cond;
-    my $html = $tmpl->build( $ctx, \%cond );
+    $param->{'comment_state'} = unpack 'H*', $ser->serialize( \$state );
+    $param->{'comment_is_static'} = 1;
+    $param->{'entry'} = $entry;
+    $param->{'current_timestamp'} = $ts;
+    $param->{'commenter'} = $app->user;
+    $param->{'blog_id'} = $parent->blog_id;
+    $param->{'blog'} = $parent->blog;
+
     return $app->build_page( 'dialog/comment_reply.tmpl',
-        { %$param, error => $tmpl->errstr } )
-      unless defined $html;
-
-    return $app->build_page( 'dialog/comment_reply.tmpl',
-        { %$param, text => $q->param('text'), preview_html => $html } );
+        { %$param, text => $q->param('text') } );
 }
 

branches/release-33/tmpl/cms/dialog/comment_reply.tmpl

@@ -31 +31 @@
         <div class="intro"><__trans phrase="Preview of your comment"></div>
         <div id="reply-body">
-            <$mt:var name="preview_html"$>
+<$mt:include name="include/comment_detail.tmpl"$>
         </div>
     </div>