Ticket #24411: site-new.php.diff

site-new.php

@@ -85 +85 @@
         if ( !is_wp_error( $id ) ) {
                 if ( !is_super_admin( $user_id ) && !get_user_option( 'primary_blog', $user_id ) )
                         update_user_option( $user_id, 'primary_blog', $id, true );
-                $content_mail = sprintf( __( 'New site created by %1$s
+
+                if ( get_site_option( 'registrationnotification' ) == 'yes' ) {
+                        $content_mail = sprintf( __( 'New site created by %1$s
 
 Address: %2$s
 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' ) . '>' );
+                        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' ) );
                 exit;