Changeset 34854 for trunk/src/wp-includes/ms-functions.php

Timestamp:

10/06/2015 04:34:03 AM (9 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-includes/ms-functions.php (modified) (2 diffs)

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

@@ -556 +556 @@
      */
     if ( ! is_subdomain_install() ) {
-        $illegal_names = array_merge(
-            $illegal_names,
-            /**
-             * Filter reserved site names on a sub-directory Multisite install.
-             *
-             * @since 3.0.0
-             * @since 4.4.0 'wp-admin', 'wp-content', 'wp-includes', 'wp-json', and 'embed' were added
-             *              to the reserved names list.
-             *
-             * @param array $subdirectory_reserved_names Array of reserved names.
-             */
-            apply_filters( 'subdirectory_reserved_names', array( 'page', 'comments', 'blog', 'files', 'feed', 'wp-admin', 'wp-content', 'wp-includes', 'wp-json', 'embed' ) )
-        );
+        $illegal_names = array_merge( $illegal_names, get_subdirectory_reserved_names() );
     }
 
@@ -2469 +2457 @@
     return $site_results;
 }
+
+/**
+ * Retrieves a list of reserved site on a sub-directory Multisite install.
+ *
+ * @since 4.4.0
+ *
+ * @return array $names Array of reserved subdirectory names.
+ */
+function get_subdirectory_reserved_names() {
+    $names = array(
+        'page', 'comments', 'blog', 'files', 'feed', 'wp-admin',
+        'wp-content', 'wp-includes', 'wp-json', 'embed'
+    );
+
+    /**
+     * Filter reserved site names on a sub-directory Multisite install.
+     *
+     * @since 3.0.0
+     * @since 4.4.0 'wp-admin', 'wp-content', 'wp-includes', 'wp-json', and 'embed' were added
+     *              to the reserved names list.
+     *
+     * @param array $subdirectory_reserved_names Array of reserved names.
+     */
+    return apply_filters( 'subdirectory_reserved_names', $names );
+}