Changeset 34912 for trunk/src/wp-admin/network/site-new.php

Timestamp:

10/07/2015 05:11:01 PM (9 years ago)

Author:

jeremyfelt

Message:

Revert [34778], continue using _site_option() for the current network.

The _network_option() parameter order will be changing to accept $network_id first. The _site_option() functions will remain in use throughout core as our way of retrieving a network option for the current network.

See #28290.

File:

• trunk/src/wp-admin/network/site-new.php (modified) (2 diffs)

trunk/src/wp-admin/network/site-new.php

@@ -125 +125 @@
             wp_unslash( $title )
         );
-        wp_mail( get_network_option( 'admin_email' ), sprintf( __( '[%s] New Site Created' ), $current_site->site_name ), $content_mail, 'From: "Site Admin" <' . get_network_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' ) );
@@ -190 +190 @@
                     <?php
                     // Network default.
-                    $lang = get_network_option( 'WPLANG' );
+                    $lang = get_site_option( 'WPLANG' );
 
                     // Use English if the default isn't available.