Index: branches/release-34/default_templates/entry_summary.mtml
===================================================================
--- branches/release-34/default_templates/entry_summary.mtml (revision 1851)
+++ branches/release-34/default_templates/entry_summary.mtml (revision 1855)
@@ -5,9 +5,17 @@
         <div class="asset-meta">
             <span class="byline">
-<MTIfNonEmpty tag="EntryAuthorDisplayName">
+<MTIf name="show_blog">
+    <MTIfNonEmpty tag="EntryAuthorDisplayName">
+                <__trans phrase="From [_1] by [_2] on [_3]" params="<$MTEntryBlogName$>%%<span class="vcard author"><$MTEntryAuthorLink show_hcard="1"$></span>%%<abbr class="published" title="<$MTEntryDate format_name="iso8601"$>"><$MTEntryDate format="%x %X"$></abbr>">
+    <MTElse>
+                <__trans phrase="From [_1] on [_2]" params="<$MTEntryBlogName$>%%<abbr class="published" title="<$MTEntryDate format_name="iso8601"$>"><$MTEntryDate format="%x %X"$></abbr>">
+    </MTIfNonEmpty>
+<MTElse>
+    <MTIfNonEmpty tag="EntryAuthorDisplayName">
                 <__trans phrase="By [_1] on [_2]" params="<span class="vcard author"><$MTEntryAuthorLink show_hcard="1"$></span>%%<abbr class="published" title="<$MTEntryDate format_name="iso8601"$>"><$MTEntryDate format="%x %X"$></abbr>">
-<MTElse>
+    <MTElse>
                 <abbr class="published" title="<$MTEntryDate format_name="iso8601"$>"><$MTEntryDate format="%x %X"$></abbr>
-</MTIfNonEmpty>
+    </MTIfNonEmpty>
+</MTIf>
             </span>
             <span class="separator">|</span> <a class="permalink" rel="bookmark" href="<$MTEntryPermalink$>"><__trans phrase="Permalink"></a>
Index: branches/release-34/default_templates/search_results.mtml
===================================================================
--- branches/release-34/default_templates/search_results.mtml (revision 1797)
+++ branches/release-34/default_templates/search_results.mtml (revision 1855)
@@ -86,4 +86,5 @@
 </head>
 <body class="mt-search-results <$MTVar name="page_layout"$>">
+<$MTBlogID setvar="blog_id">
     <div id="container">
         <div id="container-inner">
@@ -107,19 +108,19 @@
 <MTSetVarTemplate id="search_results" name="search_results">  
 <MTSearchResults>
-    <MTBlogResultHeader>
+    <MTSearchResultsHeader>
                             <div id="search-results">
                                 <span id="current-page" class="hidden"><MTCurrentPage></span>
                                 <h1 id="page-title" class="search-results-header">
         <MTIfStraightSearch>
-                                    <__trans phrase="Results matching &ldquo;[_1]&rdquo; from [_2]" params="<$MTSearchString$>%%<$MTBlogName encode_html="1"$>">
+                                    <__trans phrase="Results matching &ldquo;[_1]&rdquo;" params="<$MTSearchString$>">
         </MTIfStraightSearch>
         <MTIfTagSearch>
-                                    <__trans phrase="Results tagged &ldquo;[_1]&rdquo; from [_2]" params="<$MTSearchString$>%%<$MTBlogName encode_html="1"$>">
+                                    <__trans phrase="Results tagged &ldquo;[_1]&rdquo;" params="<$MTSearchString$>">
         </MTIfTagSearch>
                                 </h1>
                                 <div class="search-results-container autopagerize_page_element">
-    </MTBlogResultHeader>
-                                    <$MTInclude module="<__trans phrase="Entry Summary">" hide_counts="1"$>
-    <MTBlogResultFooter>
+    </MTSearchResultsHeader>
+                                    <$MTInclude module="<__trans phrase="Entry Summary">" show_blog="1" hide_counts="1" blog_id="$blog_id"$>
+    <MTSearchResultsFooter>
                                 </div><div class="autopagerize_insert_before"></div>
 
@@ -129,5 +130,5 @@
                                 </div>
                             </div>
-    </MTBlogResultFooter>
+    </MTSearchResultsFooter>
 </MTSearchResults>
 </MTSetVarTemplate>
