Ticket #18034: 18034.2.patch

wp-includes/admin-bar.php

@@ -768 +768 @@
  */
 function wp_admin_bar_search_menu( $wp_admin_bar ) {
         $form  = '<div id="adminbarsearch-wrap">';
-        $form .= '<form action="' . home_url() . '" method="get" id="adminbarsearch">';
+        $form .= '<form action="' . home_url( '/' ) . '" method="get" id="adminbarsearch">';
         $form .= '<input class="adminbar-input" name="s" id="adminbar-search"';
         $form .= 'type="text" value="" maxlength="150" placeholder="' . esc_attr__( 'Search' ) . '" />';
         $form .= '<input type="submit" class="adminbar-button" value="' . __('Search') . '"/>';

wp-includes/canonical.php

@@ -37 +37 @@
 function redirect_canonical( $requested_url = null, $do_redirect = true ) {
         global $wp_rewrite, $is_IIS, $wp_query, $wpdb;
 
-        if ( is_trackback() || is_search() || is_comments_popup() || is_admin() || !empty($_POST) || is_preview() || is_robots() || $is_IIS )
+        if ( is_trackback() || is_comments_popup() || is_admin() || !empty($_POST) || is_preview() || is_robots() || $is_IIS )
                 return;
 
         if ( !$requested_url ) {