X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/6c8f14c09105d0afa4c1574215c59b5021040e76..refs/tags/wordpress-4.0:/wp-admin/network/site-new.php diff --git a/wp-admin/network/site-new.php b/wp-admin/network/site-new.php index db2e1f74..d8024400 100644 --- 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.' ) ); @@ -27,17 +27,15 @@ if ( ! current_user_can( 'manage_sites' ) ) get_current_screen()->set_help_sidebar( '
' . __('For more information:') . '
' . '' . __('Documentation on Site Management') . '
' . - '' . __('Support Forums') . '
' + '' . __('Support Forums') . '
' ); 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:%s
' ), implode( ', ', $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,19 +106,20 @@ if ( isset($_GET['update']) ) {
$title = __('Add New Site');
$parent_file = 'sites.php';
-require('../admin-header.php');
+wp_enqueue_script( 'user-suggest' );
+
+require( ABSPATH . 'wp-admin/admin-header.php' );
?>
-
' . $msg . '
';
} ?>
-