--- lib/MT/Template/Context.pm.orig	Wed Mar  9 17:08:20 2005
+++ lib/MT/Template/Context.pm	Wed Mar  9 17:11:59 2005
@@ -943,7 +943,7 @@
     my $show_email = 1 unless exists $args->{show_email};
     my $show_url = 1 unless exists $args->{show_url};
     if ($show_url && $a->url) {
-        return sprintf qq(<a target="_blank" href="%s">%s</a>), $a->url, $name;
+        return sprintf qq(<a href="%s">%s</a>), $a->url, $name;
     } elsif ($show_email && $a->email) {
         my $str = "mailto:" . $a->email;
         $str = spam_protect($str) if $args->{'spam_protect'};
@@ -1562,11 +1562,11 @@
         my $url = remove_html($c->url);
         $url =~ s/>/&gt;/g;
         if ($c->id && !$args->{no_redirect}) {
-            return sprintf(qq(<a target="_blank" title="%s" href="%s%s?__mode=red;id=%d">%s</a>),
+            return sprintf(qq(<a title="%s" href="%s%s?__mode=red;id=%d">%s</a>),
                            $url, $cgi_path, $comment_script, $c->id, $name);
         } else {
             # In the case of preview, show URL directly without a redirect
-            return sprintf(qq(<a target="_blank" title="%s" href="%s">%s</a>),
+            return sprintf(qq(<a title="%s" href="%s">%s</a>),
                            $url, $url, $name); 
         }
     } elsif ($show_email && $c->email && MT::Util::is_valid_email($c->email)) {
@@ -2351,6 +2351,7 @@
     exists $res->{$prop}
         or return $ctx->error(MT->translate(
             'You used a non-existent property from the result structure.' ));
+    $res->{$prop} =~ s/<br>/<br \/>/g;
     $res->{$prop} || '';
 }