IntenseWebs/WordPress
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rearrage multisite initialization, remove deprecated $wpmuBaseTablePrefix, props nacin, see #11881

Browse Source 
git-svn-id: http://svn.automattic.com/wordpress/trunk@12885 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
wpmuguru
2010-01-28 16:09:52 +00:00
parent 696a6815cf
commit 493a307cf7
5 changed files with 202 additions and 222 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
wp-includes/ms-deprecated.php
View File

@@ -14,13 +14,13 @@
/**
* @since unknown
* @deprecated 3.0
* @deprecated 3.0.0
* @deprecated Use wp_generate_password()
* @see wp_generate_password()
*/
function generate_random_password( $len = 8 ) {
_deprecated_function( __FUNCTION__, '3.0', 'wp_generate_password()' );
return wp_generate_password($len);
return wp_generate_password( $len );
}
/**
@@ -32,8 +32,8 @@ function generate_random_password( $len = 8 ) {
* This function must reside in a file included only if is_multisite() due to
* legacy function_exists() checks to determine if multisite is enabled.
*
* @since unknown
* @deprecated 3.0
* @since MU
* @deprecated 3.0.0
* @deprecated Use is_super_admin()
* @see is_super_admin()
* @see is_multisite()
@@ -56,13 +56,16 @@ function is_site_admin( $user_login = '' ) {
return is_super_admin( $user_id );
}
if ( !function_exists('graceful_fail') ) :
if ( !function_exists( 'graceful_fail' ) ) :
/**
* @deprecated 3.0
* @since MU
* @deprecated 3.0.0
* @deprecated Use wp_die()
* @see wp_die()
*/
function graceful_fail( $message ) {
_deprecated_function( __FUNCTION__, '3.0', 'wp_die()' );
$message = apply_filters('graceful_fail', $message);
$message = apply_filters( 'graceful_fail', $message );
$message_template = apply_filters( 'graceful_fail_template',
'<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml"><head profile="http://gmpg.org/xfn/11">
@@ -92,41 +95,52 @@ text-align: center;
endif;
/**
* @deprecated 3.0
* @since MU
* @deprecated 3.0.0
* @deprecated Use $GLOBALS['current_user']->ID
*/
function get_current_user_id() {
_deprecated_function( __FUNCTION__, '3.0', '' );
global $current_user;
return $current_user->ID;
_deprecated_function( __FUNCTION__, '3.0', '$GLOBALS\'current_user\']->ID' );
return $GLOBALS['current_user']->ID;
}
/**
* @deprecated 3.0
* @since MU
* @deprecated 3.0.0
* @deprecated Use get_user_by()
* @see get_user_by()
*/
function get_user_details( $username ) {
_deprecated_function( __FUNCTION__, '3.0', 'get_user_by()' );
return get_user_by('login', $username);
}
/**
* @deprecated 3.0
* @since MU
* @deprecated 3.0.0
* @deprecated Use clean_post_cache()
* @see clean_post_cache()
*/
function clear_global_post_cache( $post_id ) {
_deprecated_function( __FUNCTION__, '3.0', 'clean_post_cache' );
_deprecated_function( __FUNCTION__, '3.0', 'clean_post_cache()' );
}
/**
* @deprecated 3.0
* @since MU
* @deprecated 3.0.0
* @deprecated Use is_main_site()
* @see is_main_site()
*/
function is_main_blog() {
_deprecated_function( __FUNCTION__, '3.0', 'is_main_site' );
_deprecated_function( __FUNCTION__, '3.0', 'is_main_site()' );
return is_main_site();
}
/**
* @deprecated 3.0
* @since MU
* @deprecated 3.0.0
* @deprecated Use is_email()
* @see is_email()
*/
function validate_email( $email, $check_domain = true) {
_deprecated_function( __FUNCTION__, '3.0', 'is_email()' );