Ticket #14147: 14147.2.diff

wp-admin/network/site-new.php

@@ -24 +24 @@
                 wp_die( __( 'You do not have permission to access this page.' ) );
 
         if ( is_array( $_POST['blog'] ) == false )
-                wp_die(  __( 'Can’t create an empty site.' ) );
+                wp_die( __( 'Can’t create an empty site.' ) );
         $blog = $_POST['blog'];
         $domain = '';
         if ( ! preg_match( '/(--)/', $blog['domain'] ) && preg_match( '|^([a-zA-Z0-9-])+$|', $blog['domain'] ) )
@@ -73 +73 @@
                 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 %1s\n\nAddress: http://%2s\nName: %3s"), $current_user->user_login , $newdomain . $path, stripslashes( $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'), 'site-new.php' ) );
                 exit;

wp-admin/network/site-info.php

@@ -35 +35 @@
 
         if ( isset( $_POST['update_home_url'] ) && $_POST['update_home_url'] == 'update' ) {
                 $blog_address = get_blogaddress_by_domain( $_POST['blog']['domain'], $_POST['blog']['path'] );
-                if ( get_option( 'siteurl' ) !=  $blog_address )
+                if ( get_option( 'siteurl' ) != $blog_address )
                         update_option( 'siteurl', $blog_address );
 
                 if ( get_option( 'home' ) != $blog_address )
@@ -149 +149 @@
 
 </div>
 <?php
-require('../admin-footer.php');
- No newline at end of file
+require('../admin-footer.php');

wp-admin/network/edit.php

@@ -302 +302 @@
 
         // Themes
     case 'updatethemes':
-        if ( ! current_user_can( 'manage_network_themes' ) )
-                wp_die( __( 'You do not have permission to access this page.' ) );
+                if ( ! current_user_can( 'manage_network_themes' ) )
+                        wp_die( __( 'You do not have permission to access this page.' ) );
 
         if ( is_array( $_POST['theme'] ) ) {
                         $themes = get_themes();
@@ -315 +315 @@
                         }
                         update_site_option( 'allowedthemes', $allowed_themes );
                 }
-                wp_redirect( add_query_arg( array( 'updated' => 'true', 'action' => 'themes' ),  wp_get_referer() ) );
+                wp_redirect( add_query_arg( array( 'updated' => 'true', 'action' => 'themes' ), wp_get_referer() ) );
                 exit();
         break;
 
@@ -482 +482 @@
                 $user_id = wpmu_create_user( esc_html( strtolower( $user['username'] ) ), $password, esc_html( $user['email'] ) );
 
                 if ( false == $user_id )
-                        wp_die( __( 'Duplicated username or email address.' ) );
+                        wp_die( __( 'Duplicated username or email address.' ) );
                 else
                         wp_new_user_notification( $user_id, $password );
 

wp-admin/network/site-themes.php

@@ -40 +40 @@
                                 $allowedthemes[$theme] = true;
                 }
         }
-        update_option( 'allowedthemes',  $allowedthemes );
+        update_option( 'allowedthemes', $allowedthemes );
 
         restore_current_blog();
         wp_redirect( add_query_arg( array( 'update' => 'updated', 'id' => $id ), 'site-themes.php') );
@@ -117 +117 @@
 
 </div>
 <?php
-require('../admin-footer.php');
- No newline at end of file
+require('../admin-footer.php');