Index: branches/release-34/lib/MT/Template/Context/Search.pm
===================================================================
--- branches/release-34/lib/MT/Template/Context/Search.pm (revision 1708)
+++ branches/release-34/lib/MT/Template/Context/Search.pm (revision 1855)
@@ -28,4 +28,6 @@
             'NoSearch?' => sub { ( $_[0]->stash('search_string') &&
                                    $_[0]->stash('search_string') =~ /\S/ ) ? 0 : 1 },
+            SearchResultsHeader => \&MT::Template::Context::_hdlr_pass_tokens,
+            SearchResultsFooter => \&MT::Template::Context::_hdlr_pass_tokens,
             BlogResultHeader => \&MT::Template::Context::_hdlr_pass_tokens,
             BlogResultFooter => \&MT::Template::Context::_hdlr_pass_tokens,
@@ -61,4 +63,5 @@
     my $blog_header = 1;
     my $blog_footer = 0;
+    my $footer = 0;
     my $count_per_blog = 0;
     my $max_reached = 0;
@@ -113,8 +116,11 @@
         else {
             $blog_footer = 1;
+            $footer      = 1;
         }
 
         defined(my $out = $build->build($ctx, $tokens,
             { %$cond, 
+                SearchResultsHeader => $i == 0,
+                SearchResultsFooter => $footer,
                 BlogResultHeader => $blog_header,
                 BlogResultFooter => $blog_footer,