WordPress.org

Make WordPress Core

Ticket #13304: 14920.2.patch

File 14920.2.patch, 1.5 KB (added by jorbin, 8 years ago)
  • wp-includes/ms-functions.php

     
    556556                add_site_option( 'illegal_names', $illegal_names );
    557557        }
    558558
     559        // On sub dir installs, Some names are so illegal, only a filter can spring them from jail
     560        if (! is_subdomain_install() )
     561                $illegal_names = array_merge($illegal_names, apply_filters( 'subdirectory_reserved_names', array( 'page', 'comments', 'blog', 'files', 'feed' ) ) );
     562
     563
    559564        if ( empty( $blogname ) )
    560565                $errors->add('blogname', __('Please enter a site name'));
    561566
  • wp-admin/ms-edit.php

     
    148148                $domain = '';
    149149                if ( ! preg_match( '/(--)/', $blog['domain'] ) && preg_match( '|^([a-zA-Z0-9-])+$|', $blog['domain'] ) )
    150150                        $domain = strtolower( $blog['domain'] );
     151
     152                // If not a subdomain install, make sure the domain isn't a reserved word
     153                if (! is_subdomain_install() && in_array($domain, apply_filters( 'subdirectory_reserved_names', array( 'page', 'comments', 'blog', 'files', 'feed' ) ) )
     154                )
     155                        wp_die( __('The following words are reserved for use by WordPress functions and cannot be used as blog names: blog, comments, page, files and feed' ) );
     156
    151157                $email = sanitize_email( $blog['email'] );
    152158                $title = $blog['title'];
    153159