Changeset 14928

Timestamp:

05/26/2010 03:13:16 AM (13 years ago)

Author:

nacin

Message:

Prevent super admins from shooting themselves in the foot. props jorbin. Checks blog names against an array (filterable) of reserved keywords for subdirectory installs. fixes #13304.

Location:

trunk

Files:

• wp-admin/ms-edit.php (modified) (1 diff)
• wp-includes/ms-functions.php (modified) (1 diff)

trunk/wp-admin/ms-edit.php

@@ -149 +149 @@
         if ( ! preg_match( '/(--)/', $blog['domain'] ) && preg_match( '|^([a-zA-Z0-9-])+$|', $blog['domain'] ) )
             $domain = strtolower( $blog['domain'] );
+
+        // If not a subdomain install, make sure the domain isn't a reserved word
+        if ( ! is_subdomain_install() ) {
+            $subdirectory_reserved_names = apply_filters( 'subdirectory_reserved_names', array( 'page', 'comments', 'blog', 'files', 'feed' ) );
+            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 ) ) );
+        }
+
         $email = sanitize_email( $blog['email'] );
         $title = $blog['title'];

trunk/wp-includes/ms-functions.php

@@ -557 +557 @@
     }
 
+    // On sub dir installs, Some names are so illegal, only a filter can spring them from jail
+    if (! is_subdomain_install() )
+        $illegal_names = array_merge($illegal_names, apply_filters( 'subdirectory_reserved_names', array( 'page', 'comments', 'blog', 'files', 'feed' ) ) );
+
+
     if ( empty( $blogname ) )
         $errors->add('blogname', __('Please enter a site name'));