Ticket #33615: 33615-directory-fix.patch

src/wp-admin/network/site-new.php

@@ -47 +47 @@
         // If not a subdomain install, make sure the domain isn't a reserved word
         if ( ! is_subdomain_install() ) {
                 /** This filter is documented in wp-includes/ms-functions.php */
-                $subdirectory_reserved_names = apply_filters( 'subdirectory_reserved_names', array( 'page', 'comments', 'blog', 'files', 'feed' ) );
+                $subdirectory_reserved_names = apply_filters( 'subdirectory_reserved_names', array( 'page', 'comments', 'blog', 'files', 'feed', 'wp-admin', 'wp-content', 'wp-includes' ) );
                 if ( in_array( $domain, $subdirectory_reserved_names ) )
                         wp_die( sprintf( __('The following words are reserved for use by WordPress functions and cannot be used as blog names: <code>%s</code>' ), implode( '</code>, <code>', $subdirectory_reserved_names ) ) );
         }