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

equal deleted inserted replaced

-:7b1b88e27a20
+:48c4eec2b7e6
 function clear_global_post_cache( $post_id ) {
 	_deprecated_function( __FUNCTION__, '3.0.0', 'clean_post_cache()' );
 }
 /**
-* Deprecated functionality to determin if the current site is the main site.
+* Deprecated functionality to determine if the current site is the main site.
 *
 * @since MU (3.0.0)
 * @deprecated 3.0.0 Use is_main_site()
 * @see is_main_site()
 */
 * Deprecated functionality to retrieve a list of all sites.
 *
 * @since MU (3.0.0)
 * @deprecated 3.0.0 Use wp_get_sites()
 * @see wp_get_sites()
+*
+* @global wpdb $wpdb WordPress database abstraction object.
 *
 * @param int    $start      Optional. Offset for retrieving the blog list. Default 0.
 * @param int    $num        Optional. Number of blogs to list. Default 10.
 * @param string $deprecated Unused.
 */
 	$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 ( 's_' === substr( $_GET['redirect'], 0, 2 ) )
+		if ( str_starts_with( $_GET['redirect'], '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 );
 * @return string
 */
 function wpmu_admin_redirect_add_updated_param( $url = '' ) {
 	_deprecated_function( __FUNCTION__, '3.3.0', 'add_query_arg()' );
-	if ( strpos( $url, 'updated=true' ) === false ) {
+	if ( ! str_contains( $url, 'updated=true' ) ) {
-		if ( strpos( $url, '?' ) === false )
+		if ( ! str_contains( $url, '?' ) )
 			return $url . '?updated=true';
 		else
 			return $url . '&updated=true';
 	}
 	return $url;
 *
 * @since MU (3.0.0)
 * @deprecated 3.6.0 Use get_user_by()
 * @see get_user_by()
 *
-* @param string $string Either an email address or a login.
+* @param string $email_or_login Either an email address or a login.
 * @return int
 */
-function get_user_id_from_string( $string ) {
+function get_user_id_from_string( $email_or_login ) {
 	_deprecated_function( __FUNCTION__, '3.6.0', 'get_user_by()' );
-	if ( is_email( $string ) )
+	if ( is_email( $email_or_login ) )
-		$user = get_user_by( 'email', $string );
+		$user = get_user_by( 'email', $email_or_login );
-	elseif ( is_numeric( $string ) )
+	elseif ( is_numeric( $email_or_login ) )
-		return $string;
+		return $email_or_login;
 	else
-		$user = get_user_by( 'login', $string );
+		$user = get_user_by( 'login', $email_or_login );
 	if ( $user )
 		return $user->ID;
 	return 0;
 }
 /**
-* Get a full blog URL, given a domain and a path.
+* Get a full site URL, given a domain and a path.
 *
 * @since MU (3.0.0)
 * @deprecated 3.7.0
 *
 * @param string $domain
 				$url .= $blogname . '/';
 		} else { // Main blog.
 			$url = 'http://' . $domain . $path;
 		}
 	}
-	return esc_url_raw( $url );
+	return sanitize_url( $url );
 }
 /**
 * Create an empty blog.
 *
 	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 you&#8217;ve entered is 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.
 	 * Must restore table names at the end of function.
 	 */
 	if ( ! $blog_id = insert_blog($domain, $path, $site_id) )
-		return __( '<strong>Error</strong>: There was a 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();
 		}
 	}
 	return $value;
 }
+/**
+* Maintains a canonical list of terms by syncing terms created for each blog with the global terms table.
+*
+* @since 3.0.0
+* @since 6.1.0 This function no longer does anything.
+* @deprecated 6.1.0
+*
+* @param int    $term_id    An ID for a term on the current blog.
+* @param string $deprecated Not used.
+* @return int An ID from the global terms table mapped from $term_id.
+*/
+function global_terms( $term_id, $deprecated = '' ) {
+	_deprecated_function( __FUNCTION__, '6.1.0' );
+	return $term_id;
+}

changeset 21	48c4eec2b7e6
parent 19	3d72ae0968f4