Ticket #34503: 34503.patch

wp-includes/theme-compat/sidebar.php

@@ -7 +7 @@
  * This file is here for Backwards compatibility with old themes and will be removed in a future version
  *
  */
-_deprecated_file( sprintf( __( 'Theme without %1$s' ), basename(__FILE__) ), '3.0', null, sprintf( __('Please include a %1$s template in your theme.'), basename(__FILE__) ) );
+_deprecated_file( sprintf( __( 'Theme without %s' ), basename(__FILE__) ), '3.0', null, sprintf( __('Please include a %s template in your theme.'), basename(__FILE__) ) );
 ?>
         <div id="sidebar" role="complementary">
                 <ul>
@@ -29 +29 @@
 
                         <?php /* If this is a 404 page */ if (is_404()) { ?>
                         <?php /* If this is a category archive */ } elseif (is_category()) { ?>
-                        <p><?php printf(__('You are currently browsing the archives for the %s category.'), single_cat_title('', false)); ?></p>
+                        <p><?php printf(
+                                                __('You are currently browsing the archives for the %s category.'),
+                                                single_cat_title('', false)
+                                        );
+                        ?></p>
 
                         <?php /* If this is a daily archive */ } elseif (is_day()) { ?>
-                        <p><?php printf(__('You are currently browsing the <a href="%1$s/">%2$s</a> blog archives for the day %3$s.'), get_bloginfo('url'), get_bloginfo('name'), get_the_time(__('l, F jS, Y'))); ?></p>
+                        <p><?php printf(
+                                                __('You are currently browsing the %1$s blog archives for the day %2$s.'),
+                                                '<a href="' . get_bloginfo('url') . '/">' . get_bloginfo('name') . '</a>',
+                                                get_the_time(__('l, F jS, Y'))
+                                        );
+                        ?></p>
 
                         <?php /* If this is a monthly archive */ } elseif (is_month()) { ?>
-                        <p><?php printf(__('You are currently browsing the <a href="%1$s/">%2$s</a> blog archives for %3$s.'), get_bloginfo('url'), get_bloginfo('name'), get_the_time(__('F, Y'))); ?></p>
+                        <p><?php printf(
+                                                __('You are currently browsing the %1$s blog archives for %2$s.'),
+                                                '<a href="' . get_bloginfo('url') . '/">' . get_bloginfo('name') . '</a>',
+                                                get_the_time(__('F, Y'))
+                                        );
+                        ?></p>
 
                         <?php /* If this is a yearly archive */ } elseif (is_year()) { ?>
-                        <p><?php printf(__('You are currently browsing the <a href="%1$s/">%2$s</a> blog archives for the year %3$s.'), get_bloginfo('url'), get_bloginfo('name'), get_the_time('Y')); ?></p>
+                        <p><?php printf(
+                                                __('You are currently browsing the %1$s blog archives for the year %2$s.'),
+                                                '<a href="' . get_bloginfo('url') . '/">' . get_bloginfo('name') . '</a>',
+                                                get_the_time('Y'));
+                        ?></p>
 
                         <?php /* If this is a search result */ } elseif (is_search()) { ?>
-                        <p><?php printf(__('You have searched the <a href="%1$s/">%2$s</a> blog archives for <strong>&#8216;%3$s&#8217;</strong>. If you are unable to find anything in these search results, you can try one of these links.'), get_bloginfo('url'), get_bloginfo('name'), esc_html( get_search_query() ) ); ?></p>
+                        <p><?php printf(
+                                                __('You have searched the %1$s blog archives for &#8216;%2$s&#8217;. If you are unable to find anything in these search results, you can try one of these links.'),
+                                                '<a href="' . get_bloginfo('url') . '/">' . get_bloginfo('name') . '</a>',
+                                                '<strong>' . esc_html( get_search_query() ) . '</strong>'
+                                        );
+                        ?></p>
 
                         <?php /* If this set is paginated */ } elseif (isset($_GET['paged']) && !empty($_GET['paged'])) { ?>
-                        <p><?php printf(__('You are currently browsing the <a href="%1$s/">%2$s</a> blog archives.'), get_bloginfo('url'), get_bloginfo('name')); ?></p>
+                        <p><?php printf(
+                                                __('You are currently browsing the %s blog archives.'),
+                                                '<a href="' . get_bloginfo('url') . '/">' . get_bloginfo('name') . '</a>',
+                                        );
+                        ?></p>
 
                         <?php } ?>