WordPress 3.8

[autoinstallsdev/wordpress.git] / wp-admin / network / site-new.php

diff --git a/wp-admin/network/site-new.php b/wp-admin/network/site-new.php
index db2e1f74c081dfcaa68603861ff1f248df64c2e4..672d7e869ef415e885eed9ffc911eb13921eb4b0 100644 (file)
--- a/wp-admin/network/site-new.php
+++ b/wp-admin/network/site-new.php
@@ -8,7 +8,7 @@
  */
 
 /** Load WordPress Administration Bootstrap */
-require_once( './admin.php' );
+require_once( dirname( __FILE__ ) . '/admin.php' );
 
 if ( ! is_multisite() )
        wp_die( __( 'Multisite support is not enabled.' ) );
@@ -33,11 +33,9 @@ get_current_screen()->set_help_sidebar(
 if ( isset($_REQUEST['action']) && 'add-site' == $_REQUEST['action'] ) {
        check_admin_referer( 'add-blog', '_wpnonce_add-blog' );
 
-       if ( ! current_user_can( 'manage_sites' ) )
-               wp_die( __( 'You do not have permission to access this page.' ) );
-
        if ( ! is_array( $_POST['blog'] ) )
                wp_die( __( 'Can’t create an empty site.' ) );
+
        $blog = $_POST['blog'];
        $domain = '';
        if ( preg_match( '|^([a-zA-Z0-9-])+$|', $blog['domain'] ) )
@@ -45,6 +43,7 @@ if ( isset($_REQUEST['action']) && 'add-site' == $_REQUEST['action'] ) {
 
        // 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', '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 ) ) );
@@ -88,7 +87,7 @@ if ( isset($_REQUEST['action']) && 'add-site' == $_REQUEST['action'] ) {
                $content_mail = sprintf( __( 'New site created by %1$s
 
 Address: %2$s
-Name: %3$s' ), $current_user->user_login , get_site_url( $id ), stripslashes( $title ) );
+Name: %3$s' ), $current_user->user_login , get_site_url( $id ), wp_unslash( $title ) );
                wp_mail( get_site_option('admin_email'), sprintf( __( '[%s] New Site Created' ), $current_site->site_name ), $content_mail, 'From: "Site Admin" <' . get_site_option( 'admin_email' ) . '>' );
                wpmu_welcome_notification( $id, $user_id, $password, $title, array( 'public' => 1 ) );
                wp_redirect( add_query_arg( array( 'update' => 'added', 'id' => $id ), 'site-new.php' ) );
@@ -107,12 +106,11 @@ if ( isset($_GET['update']) ) {
 $title = __('Add New Site');
 $parent_file = 'sites.php';
 
-require('../admin-header.php');
+require( ABSPATH . 'wp-admin/admin-header.php' );
 
 ?>
 
 <div class="wrap">
-<?php screen_icon('ms-admin'); ?>
 <h2 id="add-new-site"><?php _e('Add New Site') ?></h2>
 <?php
 if ( ! empty( $messages ) ) {
@@ -150,4 +148,4 @@ if ( ! empty( $messages ) ) {
        </form>
 </div>
 <?php
-require('../admin-footer.php');
+require( ABSPATH . 'wp-admin/admin-footer.php' );