Changeset 33952

Timestamp:

09/08/2015 07:31:52 PM (11 years ago)

Author:

wonderboymusic

Message:

Multisite: Don't allow sites to be created with the following reserved slugs: wp-admin, wp-content, wp-includes

Props austinginder.
Fixes #33615.

Location:

trunk/src

Files:

• wp-admin/network/site-new.php (modified) (1 diff)
• wp-includes/ms-functions.php (modified) (1 diff)

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

@@ -48 +48 @@
         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 ) ) );

trunk/src/wp-includes/ms-functions.php

@@ -623 +623 @@
                          * @param array $subdirectory_reserved_names Array of reserved names.
                          */
-                        apply_filters( 'subdirectory_reserved_names', array( 'page', 'comments', 'blog', 'files', 'feed' ) )
+                        apply_filters( 'subdirectory_reserved_names', array( 'page', 'comments', 'blog', 'files', 'feed', 'wp-admin', 'wp-content', 'wp-includes' ) )
                 );
         }