Ticket #18302: 18302.2.patch

admin-bar.php

@@ -101 +101 @@
 function wp_admin_bar_dashboard_view_site_menu( $wp_admin_bar ) {
         $user_id = get_current_user_id();
 
-        if ( 0 != $user_id ) {
+        if ( !is_network_admin() and ( 0 != $user_id ) ) {
                 if ( is_admin() )
                         $wp_admin_bar->add_menu( array( 'id' => 'view-site', 'title' => __( 'Visit Site' ), 'href' => home_url() ) );
                 elseif ( is_multisite() )

class-wp-admin-bar.php

@@ -98 +98 @@
                                 </ul>
                         </div>
 
-                        <div id="adminbarsearch-wrap">
-                                <form action="<?php echo home_url(); ?>" method="get" id="adminbarsearch">
-                                        <input class="adminbar-input" name="s" id="adminbar-search" type="text" value="" maxlength="150" />
-                                        <input type="submit" class="adminbar-button" value="<?php _e('Search'); ?>"/>
-                                </form>
-                        </div>
+                        <?php if ( !is_network_admin() ) { ?>
+                                <div id="adminbarsearch-wrap">
+                                        <form action="<?php echo home_url(); ?>" method="get" id="adminbarsearch">
+                                                <input class="adminbar-input" name="s" id="adminbar-search" type="text" value="" maxlength="150" />
+                                                <input type="submit" class="adminbar-button" value="<?php _e('Search'); ?>"/>
+                                        </form>
+                                </div>
+                        <?php } ?>
                 </div>
 
                 <?php

theme.php

@@ -1060 +1060 @@
 }
 
 /**
- * Retrieve the name of the highest priority template file that exists.
+ * Retrieve the full file path to the highest priority template file that exists.
  *
  * Searches in the STYLESHEETPATH before TEMPLATEPATH so that themes which
  * inherit from a parent theme can just overload one file.
@@ -1093 +1093 @@
 }
 
 /**
+ * Retrieve the URI of the highest priority template file that exists.
+ *
+ * Searches in the stylesheet directory before the template directory so themes
+ * which inherit from a parent theme can just overload one file.
+ *
+ * @since 3.3
+ *
+ * @param string|array $template_names Template file(s) to search for, in order.
+ * @return string The URI of the file if one is located.
+ */
+function locate_template_uri( $template_names ) {
+        $located = '';
+        foreach ( (array) $template_names as $template_name ) {
+                if ( !$template_name )
+                        continue;
+                if ( file_exists(get_stylesheet_directory() . '/' . $template_name)) {
+                        $located = get_stylesheet_directory_uri() . '/' . $template_name;
+                        break;
+                } else if ( file_exists(get_template_directory() . '/' . $template_name) ) {
+                        $located = get_template_directory_uri() . '/' . $template_name;
+                        break;
+                }
+        }
+
+        return $located;
+}
+
+/**
  * Require the template file with WordPress environment.
  *
  * The globals are set up for the template file to ensure that the WordPress