Remove references to unused globals. props jeremyfelt. fixes #24984.

Built from https://develop.svn.wordpress.org/trunk@25018


git-svn-id: http://core.svn.wordpress.org/trunk@25009 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Dominik Schilling 2013-08-15 03:13:05 +00:00
parent da016d59b4
commit 029e4cf3a6

View File

@ -17,8 +17,6 @@
* @return array Site and user count for the network. * @return array Site and user count for the network.
*/ */
function get_sitestats() { function get_sitestats() {
global $wpdb;
$stats = array( $stats = array(
'blogs' => get_blog_count(), 'blogs' => get_blog_count(),
'users' => get_user_count(), 'users' => get_user_count(),
@ -815,7 +813,7 @@ function wpmu_signup_user_notification($user, $user_email, $key, $meta = '') {
* @return array An array containing information about the activated user and/or blog * @return array An array containing information about the activated user and/or blog
*/ */
function wpmu_activate_signup($key) { function wpmu_activate_signup($key) {
global $wpdb, $current_site; global $wpdb;
$signup = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->signups WHERE activation_key = %s", $key) ); $signup = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->signups WHERE activation_key = %s", $key) );
@ -1608,7 +1606,6 @@ function signup_nonce_check( $result ) {
* @since MU * @since MU
*/ */
function maybe_redirect_404() { function maybe_redirect_404() {
global $current_site;
if ( is_main_site() && is_404() && defined( 'NOBLOGREDIRECT' ) && ( $destination = apply_filters( 'blog_redirect_404', NOBLOGREDIRECT ) ) ) { if ( is_main_site() && is_404() && defined( 'NOBLOGREDIRECT' ) && ( $destination = apply_filters( 'blog_redirect_404', NOBLOGREDIRECT ) ) ) {
if ( $destination == '%siteurl%' ) if ( $destination == '%siteurl%' )
$destination = network_home_url(); $destination = network_home_url();