Ticket #21573: 21573.patch

ms-functions.php

@@ -1607 +1607 @@
 }
 
 /**
- * Correct 404 redirects when NOBLOGREDIRECT is defined.
+ * Correct 404 redirects on subdirectory installs
+ * when NOBLOGREDIRECT is defined.
  *
  * @since MU
  */
 function maybe_redirect_404() {
+
+        // If we're running on a subdomain install, bail early
+        if ( is_subdomain_install() )
+                return;
+
+        // Otherwise, do the redirect
         global $current_site;
         if ( is_main_site() && is_404() && defined( 'NOBLOGREDIRECT' ) && ( $destination = apply_filters( 'blog_redirect_404', NOBLOGREDIRECT ) ) ) {
                 if ( $destination == '%siteurl%' )