Changeset 34854 for trunk/src/wp-admin/network/site-new.php

Timestamp:

10/06/2015 04:34:03 AM (4 years ago)

Author:

DrewAPicture

Message:

Multisite: Introduce get_subdirectory_reserved_names(), which returns a filterable list of reserved subdirectory site names.

The function encapsulates the existing subdirectory_reserved_names filter and reduces the maintenance burden of keeping the value of (currently) two instances of the same hook in sync.

See #33615.

File:

• trunk/src/wp-admin/network/site-new.php (modified) (1 diff)

trunk/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', 'embed', 'files', 'feed', 'wp-admin', 'wp-content', 'wp-includes', 'wp-json' ) );
-        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 ) ) );
+        $subdirectory_reserved_names = get_subdirectory_reserved_names();
+
+        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 ) ) );
+        }
     }