enmi-conf.org: comparison wp/wp-includes/ms-deprecated.php

equal deleted inserted replaced

-:3d4e9c994f10
+:a86126ab1dd4
 function graceful_fail( $message ) {
 	_deprecated_function( __FUNCTION__, '3.0.0', 'wp_die()' );
 	$message = apply_filters( 'graceful_fail', $message );
 	$message_template = apply_filters( 'graceful_fail_template',
 '<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml"><head>
+<html><head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 <title>Error!</title>
 <style type="text/css">
 img {
 	border: 0;
 * @deprecated 3.0.0 Use is_email()
 * @see is_email()
 *
 * @param string $email        Email address to verify.
 * @param bool   $check_domain Deprecated.
-* @return string|bool Either false or the valid email address.
+* @return string|false Valid email address on success, false on failure.
 */
 function validate_email( $email, $check_domain = true) {
 	_deprecated_function( __FUNCTION__, '3.0.0', 'is_email()' );
 	return is_email( $email, $check_domain );
 }
 	if ( ! $blog_list ) {
 		return array();
 	}
-	if ( $num == 'all' ) {
+	if ( 'all' === $num ) {
 		return array_slice( $blog_list, $start, count( $blog_list ) );
 	} else {
 		return array_slice( $blog_list, $start, $num );
 	}
 }
 		reset( $blogs );
 		$most_active = array();
 		$blog_list = array();
 		foreach ( (array) $blogs as $key => $details ) {
 			$most_active[ $details['blog_id'] ] = $details['postcount'];
-			$blog_list[ $details['blog_id'] ] = $details; // array_slice() removes keys!!
+			$blog_list[ $details['blog_id'] ] = $details; // array_slice() removes keys!
 		}
 		arsort( $most_active );
 		reset( $most_active );
 		$t = array();
 		foreach ( (array) $most_active as $key => $details ) {
 	$ref = '';
 	if ( isset( $_GET['ref'] ) && isset( $_POST['ref'] ) && $_GET['ref'] !== $_POST['ref'] ) {
 		wp_die( __( 'A variable mismatch has been detected.' ), __( 'Sorry, you are not allowed to view this item.' ), 400 );
 	} elseif ( isset( $_POST['ref'] ) ) {
-		$ref = $_POST[ 'ref' ];
+		$ref = $_POST['ref'];
 	} elseif ( isset( $_GET['ref'] ) ) {
-		$ref = $_GET[ 'ref' ];
+		$ref = $_GET['ref'];
 	}
 	if ( $ref ) {
 		$ref = wpmu_admin_redirect_add_updated_param( $ref );
 		wp_redirect( $ref );
-		exit();
+		exit;
 	}
 	if ( ! empty( $_SERVER['HTTP_REFERER'] ) ) {
 		wp_redirect( $_SERVER['HTTP_REFERER'] );
-		exit();
+		exit;
 	}
 	$url = wpmu_admin_redirect_add_updated_param( $url );
 	if ( isset( $_GET['redirect'] ) && isset( $_POST['redirect'] ) && $_GET['redirect'] !== $_POST['redirect'] ) {
 		wp_die( __( 'A variable mismatch has been detected.' ), __( 'Sorry, you are not allowed to view this item.' ), 400 );
 	} elseif ( isset( $_GET['redirect'] ) ) {
-		if ( substr( $_GET['redirect'], 0, 2 ) == 's_' )
+		if ( 's_' === substr( $_GET['redirect'], 0, 2 ) )
 			$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();
+	exit;
 }
 /**
 * Adds an 'updated=true' argument to a URL.
 *
 		$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
+			// We're not installing the main blog.
-			if ( $blogname != 'www.' )
+			if ( 'www.' !== $blogname )
 				$url .= $blogname . '/';
-		} else { // main blog
+		} else { // Main blog.
 			$url = 'http://' . $domain . $path;
 		}
 	}
 	return esc_url_raw( $url );
 }
 	if ( empty($path) )
 		$path = '/';
 	// Check if the domain has been used already. We should return an error message.
 	if ( domain_exists($domain, $path, $site_id) )
-		return __( '<strong>ERROR</strong>: Site URL already taken.' );
+		return __( '<strong>Error</strong>: Site URL you&#8217;ve entered is already taken.' );
-	// Need to back up wpdb table names, and create a new wp_blogs entry for new blog.
+	/*
-	// Need to get blog_id from wp_blogs, and create new table names.
+	 * Need to back up wpdb table names, and create a new wp_blogs entry for new blog.
-	// Must restore table names at the end of function.
+	 * Need to get blog_id from wp_blogs, and create new table names.
+	 * Must restore table names at the end of function.
+	 */
 	if ( ! $blog_id = insert_blog($domain, $path, $site_id) )
-		return __( '<strong>ERROR</strong>: problem creating site entry.' );
+		return __( '<strong>Error</strong>: There was a problem creating site entry.' );
 	switch_to_blog($blog_id);
 	install_blog($blog_id);
 	restore_current_blog();
 *     @type int       $spam       Retrieve spam or non-spam sites. Default null, for any.
 *     @type int       $deleted    Retrieve deleted or non-deleted sites. Default null, for any.
 *     @type int       $limit      Number of sites to limit the query to. Default 100.
 *     @type int       $offset     Exclude the first x sites. Used in combination with the $limit parameter. Default 0.
 * }
-* @return array An empty array if the installation is considered "large" via wp_is_large_network(). Otherwise,
+* @return array[] An empty array if the installation is considered "large" via wp_is_large_network(). Otherwise,
-*               an associative array of site data arrays, each containing the site (network) ID, blog ID,
+*                 an associative array of WP_Site data as arrays.
-*               site domain and path, dates registered and modified, and the language ID. Also, boolean
-*               values for whether the site is public, archived, mature, spam, and/or deleted.
 */
 function wp_get_sites( $args = array() ) {
 	_deprecated_function( __FUNCTION__, '4.6.0', 'get_sites()' );
 	if ( wp_is_large_network() )
 		'offset'     => 0,
 	);
 	$args = wp_parse_args( $args, $defaults );
-	// Backwards compatibility
+	// Backward compatibility.
 	if( is_array( $args['network_id'] ) ){
 		$args['network__in'] = $args['network_id'];
 		$args['network_id'] = null;
 	}
 * points to the new blog.
 *
 * @since MU (3.0.0)
 * @deprecated 5.1.0
 *
-* @global wpdb     $wpdb
+* @global wpdb     $wpdb     WordPress database abstraction object.
-* @global WP_Roles $wp_roles
+* @global WP_Roles $wp_roles WordPress role management object.
 *
 * @param int    $blog_id    The value returned by wp_insert_site().
 * @param string $blog_title The title of the new site.
 */
 function install_blog( $blog_id, $blog_title = '' ) {
 	global $wpdb, $wp_roles;
 	_deprecated_function( __FUNCTION__, '5.1.0' );
-	// Cast for security
+	// Cast for security.
 	$blog_id = (int) $blog_id;
-	require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
+	require_once ABSPATH . 'wp-admin/includes/upgrade.php';
 	$suppress = $wpdb->suppress_errors();
 	if ( $wpdb->get_results( "DESCRIBE {$wpdb->posts}" ) ) {
 		die( '<h1>' . __( 'Already Installed' ) . '</h1><p>' . __( 'You appear to have already installed WordPress. To reinstall please clear your old database tables first.' ) . '</p></body></html>' );
 	}
 	$wpdb->suppress_errors( $suppress );
 	$url = get_blogaddress_by_id( $blog_id );
-	// Set everything up
+	// Set everything up.
 	make_db_current_silent( 'blog' );
 	populate_options();
 	populate_roles();
 	// populate_roles() clears previous role definitions so we start over.
 	}
 	update_option( 'blogname', wp_unslash( $blog_title ) );
 	update_option( 'admin_email', '' );
-	// remove all perms
+	// Remove all permissions.
 	$table_prefix = $wpdb->get_blog_prefix();
-	delete_metadata( 'user', 0, $table_prefix . 'user_level', null, true ); // delete all
+	delete_metadata( 'user', 0, $table_prefix . 'user_level', null, true );   // Delete all.
-	delete_metadata( 'user', 0, $table_prefix . 'capabilities', null, true ); // delete all
+	delete_metadata( 'user', 0, $table_prefix . 'capabilities', null, true ); // Delete all.
 }
 /**
 * Set blog defaults.
 *
 function install_blog_defaults( $blog_id, $user_id ) {
 	global $wpdb;
 	_deprecated_function( __FUNCTION__, 'MU' );
-	require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
+	require_once ABSPATH . 'wp-admin/includes/upgrade.php';
 	$suppress = $wpdb->suppress_errors();
 	wp_install_defaults( $user_id );
 	$wpdb->suppress_errors( $suppress );
 }
+/**
+* Update the status of a user in the database.
+*
+* Previously used in core to mark a user as spam or "ham" (not spam) in Multisite.
+*
+* @since 3.0.0
+* @deprecated 5.3.0 Use wp_update_user()
+* @see wp_update_user()
+*
+* @global wpdb $wpdb WordPress database abstraction object.
+*
+* @param int    $id         The user ID.
+* @param string $pref       The column in the wp_users table to update the user's status
+*                           in (presumably user_status, spam, or deleted).
+* @param int    $value      The new status for the user.
+* @param null   $deprecated Deprecated as of 3.0.2 and should not be used.
+* @return int   The initially passed $value.
+*/
+function update_user_status( $id, $pref, $value, $deprecated = null ) {
+	global $wpdb;
+	_deprecated_function( __FUNCTION__, '5.3.0', 'wp_update_user()' );
+	if ( null !== $deprecated ) {
+		_deprecated_argument( __FUNCTION__, '3.0.2' );
+	}
+	$wpdb->update( $wpdb->users, array( sanitize_key( $pref ) => $value ), array( 'ID' => $id ) );
+	$user = new WP_User( $id );
+	clean_user_cache( $user );
+	if ( 'spam' === $pref ) {
+		if ( $value == 1 ) {
+			/** This filter is documented in wp-includes/user.php */
+			do_action( 'make_spam_user', $id );
+		} else {
+			/** This filter is documented in wp-includes/user.php */
+			do_action( 'make_ham_user', $id );
+		}
+	}
+	return $value;
+}

changeset 16	a86126ab1dd4
parent 9	177826044cd9
child 18	be944660c56a