X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/699231ae09f7057a4d0000cdf32e50a3df6a04ca..refs/tags/wordpress-3.7:/wp-includes/ms-deprecated.php
diff --git a/wp-includes/ms-deprecated.php b/wp-includes/ms-deprecated.php
index b6073628..30026a87 100644
--- a/wp-includes/ms-deprecated.php
+++ b/wp-includes/ms-deprecated.php
@@ -14,7 +14,24 @@
*/
/**
- * @since unknown
+ * Get the "dashboard blog", the blog where users without a blog edit their profile data.
+ * Dashboard blog functionality was removed in WordPress 3.1, replaced by the user admin.
+ *
+ * @since MU
+ * @deprecated 3.1.0
+ * @see get_blog_details()
+ * @return int
+ */
+function get_dashboard_blog() {
+ _deprecated_function( __FUNCTION__, '3.1' );
+ if ( $blog = get_site_option( 'dashboard_blog' ) )
+ return get_blog_details( $blog );
+
+ return get_blog_details( $GLOBALS['current_site']->blog_id );
+}
+
+/**
+ * @since MU
* @deprecated 3.0.0
* @deprecated Use wp_generate_password()
* @see wp_generate_password()
@@ -48,10 +65,10 @@ function is_site_admin( $user_login = '' ) {
if ( !$user_id )
return false;
} else {
- $user = new WP_User( null, $user_login) ;
- if ( empty( $user->id ) )
+ $user = get_user_by( 'login', $user_login );
+ if ( ! $user->exists() )
return false;
- $user_id = $user->id;
+ $user_id = $user->ID;
}
return is_super_admin( $user_id );
@@ -68,7 +85,7 @@ function graceful_fail( $message ) {
_deprecated_function( __FUNCTION__, '3.0', 'wp_die()' );
$message = apply_filters( 'graceful_fail', $message );
$message_template = apply_filters( 'graceful_fail_template',
-'
+'
Error!
@@ -141,10 +158,10 @@ function validate_email( $email, $check_domain = true) {
/**
* @since MU
* @deprecated 3.0.0
- * @deprecated Don't use this, really.
+ * @deprecated No alternative available. For performance reasons this function is not recommended.
*/
function get_blog_list( $start = 0, $num = 10, $deprecated = '' ) {
- _deprecated_function( __FUNCTION__, '3.0', "Don't use this, really." );
+ _deprecated_function( __FUNCTION__, '3.0', 'wp_get_sites()' );
global $wpdb;
$blogs = $wpdb->get_results( $wpdb->prepare("SELECT blog_id, domain, path FROM $wpdb->blogs WHERE site_id = %d AND public = '1' AND archived = '0' AND mature = '0' AND spam = '0' AND deleted = '0' ORDER BY registered DESC", $wpdb->siteid), ARRAY_A );
@@ -168,10 +185,10 @@ function get_blog_list( $start = 0, $num = 10, $deprecated = '' ) {
/**
* @since MU
* @deprecated 3.0.0
- * @deprecated Don't use this, really.
+ * @deprecated No alternative available. For performance reasons this function is not recommended.
*/
function get_most_active_blogs( $num = 10, $display = true ) {
- _deprecated_function( __FUNCTION__, '3.0', "Don't use this, really." );
+ _deprecated_function( __FUNCTION__, '3.0' );
$blogs = get_blog_list( 0, 'all', false ); // $blog_id -> $details
if ( is_array( $blogs ) ) {
@@ -200,4 +217,131 @@ function get_most_active_blogs( $num = 10, $display = true ) {
}
return array_slice( $most_active, 0, $num );
}
-?>
+
+/**
+ * Redirect a user based on $_GET or $_POST arguments.
+ *
+ * The function looks for redirect arguments in the following order:
+ * 1) $_GET['ref']
+ * 2) $_POST['ref']
+ * 3) $_SERVER['HTTP_REFERER']
+ * 4) $_GET['redirect']
+ * 5) $_POST['redirect']
+ * 6) $url
+ *
+ * @since MU
+ * @deprecated 3.3.0
+ * @deprecated Use wp_redirect()
+ * @uses wpmu_admin_redirect_add_updated_param()
+ *
+ * @param string $url
+ */
+function wpmu_admin_do_redirect( $url = '' ) {
+ _deprecated_function( __FUNCTION__, '3.3' );
+
+ $ref = '';
+ if ( isset( $_GET['ref'] ) )
+ $ref = $_GET['ref'];
+ if ( isset( $_POST['ref'] ) )
+ $ref = $_POST['ref'];
+
+ if ( $ref ) {
+ $ref = wpmu_admin_redirect_add_updated_param( $ref );
+ wp_redirect( $ref );
+ exit();
+ }
+ if ( empty( $_SERVER['HTTP_REFERER'] ) == false ) {
+ wp_redirect( $_SERVER['HTTP_REFERER'] );
+ exit();
+ }
+
+ $url = wpmu_admin_redirect_add_updated_param( $url );
+ if ( isset( $_GET['redirect'] ) ) {
+ if ( substr( $_GET['redirect'], 0, 2 ) == 's_' )
+ $url .= '&action=blogs&s='. esc_html( substr( $_GET['redirect'], 2 ) );
+ } elseif ( isset( $_POST['redirect'] ) ) {
+ $url = wpmu_admin_redirect_add_updated_param( $_POST['redirect'] );
+ }
+ wp_redirect( $url );
+ exit();
+}
+
+/**
+ * Adds an 'updated=true' argument to a URL.
+ *
+ * @since MU
+ * @deprecated 3.3.0
+ * @deprecated Use add_query_arg()
+ *
+ * @param string $url
+ * @return string
+ */
+function wpmu_admin_redirect_add_updated_param( $url = '' ) {
+ _deprecated_function( __FUNCTION__, '3.3' );
+
+ if ( strpos( $url, 'updated=true' ) === false ) {
+ if ( strpos( $url, '?' ) === false )
+ return $url . '?updated=true';
+ else
+ return $url . '&updated=true';
+ }
+ return $url;
+}
+
+/**
+ * Get a numeric user ID from either an email address or a login.
+ *
+ * A numeric string is considered to be an existing user ID
+ * and is simply returned as such.
+ *
+ * @since MU
+ * @deprecated 3.6.0
+ * @deprecated Use get_user_by()
+ * @uses get_user_by()
+ *
+ * @param string $string Either an email address or a login.
+ * @return int
+ */
+function get_user_id_from_string( $string ) {
+ _deprecated_function( __FUNCTION__, '3.6', 'get_user_by()' );
+
+ if ( is_email( $string ) )
+ $user = get_user_by( 'email', $string );
+ elseif ( is_numeric( $string ) )
+ return $string;
+ else
+ $user = get_user_by( 'login', $string );
+
+ if ( $user )
+ return $user->ID;
+ return 0;
+}
+
+/**
+ * Get a full blog URL, given a domain and a path.
+ *
+ * @since MU
+ * @deprecated 3.7.0
+ *
+ * @param string $domain
+ * @param string $path
+ * @return string
+ */
+function get_blogaddress_by_domain( $domain, $path ) {
+ _deprecated_function( __FUNCTION__, '3.7' );
+
+ if ( is_subdomain_install() ) {
+ $url = "http://" . $domain.$path;
+ } else {
+ if ( $domain != $_SERVER['HTTP_HOST'] ) {
+ $blogname = substr( $domain, 0, strpos( $domain, '.' ) );
+ $url = 'http://' . substr( $domain, strpos( $domain, '.' ) + 1 ) . $path;
+ // we're not installing the main blog
+ if ( $blogname != 'www.' )
+ $url .= $blogname . '/';
+ } else { // main blog
+ $url = 'http://' . $domain . $path;
+ }
+ }
+ return esc_url_raw( $url );
+}