WordPress.org

Make WordPress Core


Ignore:
Timestamp:
10/07/2015 05:11:01 PM (5 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:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/wp-admin/network/site-new.php

    r34854 r34912  
    125125            wp_unslash( $title )
    126126        );
    127         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' ) . '>' );
     127        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' ) . '>' );
    128128        wpmu_welcome_notification( $id, $user_id, $password, $title, array( 'public' => 1 ) );
    129129        wp_redirect( add_query_arg( array( 'update' => 'added', 'id' => $id ), 'site-new.php' ) );
     
    190190                    <?php
    191191                    // Network default.
    192                     $lang = get_network_option( 'WPLANG' );
     192                    $lang = get_site_option( 'WPLANG' );
    193193
    194194                    // Use English if the default isn't available.
Note: See TracChangeset for help on using the changeset viewer.