Networks and sites: Replace "blog" usage with "site" in docs.

Multisite functions use the term "blog" to refer to what we now call a "site," e.g. `get_current_blog_id()`. These functions are here to stay because of our commitment to backwards compatibility. What we can do is set the documentation straight.

See #35417.

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


git-svn-id: http://core.svn.wordpress.org/trunk@36383 1a063a9b-81f0-0310-95a4-ce76da25c4cd

Author: ericandrewlewis

wp-activate.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * Confirms that the activation key that is sent in an email after a user signs
- * up for a new blog matches the key for that user and then displays confirmation.
+ * up for a new site matches the key for that user and then displays confirmation.
  *
  * @package WordPress
  */
@@ -117,9 +117,9 @@ function wpmu_activate_stylesheet() {
 			</div>
 
 			<?php if ( $url && $url != network_home_url( '', 'http' ) ) :
-				switch_to_blog( (int) $result['blog_id'] ); 
-				$login_url = wp_login_url(); 
-				restore_current_blog(); 
+				switch_to_blog( (int) $result['blog_id'] );
+				$login_url = wp_login_url();
+				restore_current_blog();
 				?>
 				<p class="view"><?php printf( __( 'Your account is now activated. <a href="%1$s">View your site</a> or <a href="%2$s">Log in</a>' ), $url, esc_url( $login_url ) ); ?></p>
 			<?php else: ?>

wp-admin/includes/class-wp-ms-sites-list-table.php

@@ -84,7 +84,7 @@ public function prepare_items() {
 
 		/*
 		 * If the network is large and a search is not being performed, show only
-		 * the latest blogs with no paging in order to avoid expensive count queries.
+		 * the latest sites with no paging in order to avoid expensive count queries.
 		 */
 		if ( !$s && wp_is_large_network() ) {
 			if ( !isset($_REQUEST['orderby']) )
@@ -272,14 +272,14 @@ public function column_id( $blog ) {
 	}
 
 	/**
-	 * Handles the blogname column output.
+	 * Handles the site name column output.
 	 *
 	 * @since 4.3.0
 	 * @access public
 	 *
 	 * @global string $mode
 	 *
-	 * @param array $blog Current blog.
+	 * @param array $blog Current site.
 	 */
 	public function column_blogname( $blog ) {
 		global $mode;
@@ -469,7 +469,7 @@ protected function get_default_primary_column_name() {
 	 * @since 4.3.0
 	 * @access protected
 	 *
-	 * @param object $blog        Blog being acted upon.
+	 * @param object $blog        Site being acted upon.
 	 * @param string $column_name Current column name.
 	 * @param string $primary     Primary column name.
 	 * @return string Row actions output.

wp-admin/includes/class-wp-ms-users-list-table.php

@@ -304,7 +304,7 @@ protected function _column_blogs( $user, $classes, $data, $primary ) {
 	}
 
 	/**
-	 * Handles the blogs/sites column output.
+	 * Handles the sites column output.
 	 *
 	 * @since 4.3.0
 	 * @access public

wp-admin/includes/deprecated.php

@@ -983,7 +983,7 @@ function add_contextual_help( $screen, $help ) {
 }
 
 /**
- * Get the allowed themes for the current blog.
+ * Get the allowed themes for the current site.
  *
  * @since 3.0.0
  * @deprecated 3.4.0 Use wp_get_themes()

wp-admin/includes/ms.php

@@ -48,14 +48,14 @@ function check_upload_size( $file ) {
 }
 
 /**
- * Delete a blog.
+ * Delete a site.
  *
  * @since 3.0.0
  *
  * @global wpdb $wpdb WordPress database abstraction object.
  *
- * @param int  $blog_id Blog ID.
- * @param bool $drop    True if blog's table should be dropped. Default is false.
+ * @param int  $blog_id Site ID.
+ * @param bool $drop    True if site's database tables should be dropped. Default is false.
  */
 function wpmu_delete_blog( $blog_id, $drop = false ) {
 	global $wpdb;
@@ -68,12 +68,12 @@ function wpmu_delete_blog( $blog_id, $drop = false ) {
 
 	$blog = get_blog_details( $blog_id );
 	/**
-	 * Fires before a blog is deleted.
+	 * Fires before a site is deleted.
 	 *
 	 * @since MU
 	 *
-	 * @param int  $blog_id The blog ID.
-	 * @param bool $drop    True if blog's table should be dropped. Default is false.
+	 * @param int  $blog_id The site ID.
+	 * @param bool $drop    True if site's table should be dropped. Default is false.
 	 */
 	do_action( 'delete_blog', $blog_id, $drop );
 
@@ -112,12 +112,12 @@ function wpmu_delete_blog( $blog_id, $drop = false ) {
 
 		$tables = $wpdb->tables( 'blog' );
 		/**
-		 * Filter the tables to drop when the blog is deleted.
+		 * Filter the tables to drop when the site is deleted.
 		 *
 		 * @since MU
 		 *
-		 * @param array $tables  The blog tables to be dropped.
-		 * @param int   $blog_id The ID of the blog to drop tables for.
+		 * @param array $tables  The site tables to be dropped.
+		 * @param int   $blog_id The ID of the site to drop tables for.
 		 */
 		$drop_tables = apply_filters( 'wpmu_drop_tables', $tables, $blog_id );
 
@@ -128,12 +128,12 @@ function wpmu_delete_blog( $blog_id, $drop = false ) {
 		$wpdb->delete( $wpdb->blogs, array( 'blog_id' => $blog_id ) );
 
 		/**
-		 * Filter the upload base directory to delete when the blog is deleted.
+		 * Filter the upload base directory to delete when the site is deleted.
 		 *
 		 * @since MU
 		 *
 		 * @param string $uploads['basedir'] Uploads path without subdirectory. @see wp_upload_dir()
-		 * @param int    $blog_id            The blog ID.
+		 * @param int    $blog_id            The site ID.
 		 */
 		$dir = apply_filters( 'wpmu_delete_blog_upload_dir', $uploads['basedir'], $blog_id );
 		$dir = rtrim( $dir, DIRECTORY_SEPARATOR );
@@ -410,7 +410,7 @@ function new_user_email_admin_notice() {
 }
 
 /**
- * Check whether a blog has used its allotted upload space.
+ * Check whether a site has used its allotted upload space.
  *
  * @since MU
  *
@@ -437,7 +437,7 @@ function upload_is_user_over_quota( $echo = true ) {
 }
 
 /**
- * Displays the amount of disk space used by the current blog. Not used in core.
+ * Displays the amount of disk space used by the current site. Not used in core.
  *
  * @since MU
  */
@@ -462,7 +462,7 @@ function display_space_usage() {
 }
 
 /**
- * Get the remaining upload space for this blog.
+ * Get the remaining upload space for this site.
  *
  * @since MU
  *
@@ -478,11 +478,11 @@ function fix_import_form_size( $size ) {
 }
 
 /**
- * Displays the edit blog upload space setting form on the Edit Blog screen.
+ * Displays the site upload space quota setting form on the Edit Site Settings screen.
  *
  * @since 3.0.0
  *
- * @param int $id The ID of the blog to display the setting for.
+ * @param int $id The ID of the site to display the setting for.
  */
 function upload_space_setting( $id ) {
 	switch_to_blog( $id );

wp-admin/includes/options.php

@@ -131,11 +131,11 @@ function options_reading_add_js() {
 }
 
 /**
- * Render the blog charset setting.
+ * Render the site charset setting.
  *
  * @since 3.5.0
  */
 function options_reading_blog_charset() {
 	echo '<input name="blog_charset" type="text" id="blog_charset" value="' . esc_attr( get_option( 'blog_charset' ) ) . '" class="regular-text" />';
 	echo '<p class="description">' . __( 'The <a href="https://codex.wordpress.org/Glossary#Character_set">character encoding</a> of your site (UTF-8 is recommended)' ) . '</p>';
-}
+}

wp-admin/includes/schema.php

@@ -30,7 +30,7 @@
  * @global wpdb $wpdb WordPress database abstraction object.
  *
  * @param string $scope Optional. The tables for which to retrieve SQL. Can be all, global, ms_global, or blog tables. Defaults to all.
- * @param int $blog_id Optional. The blog ID for which to retrieve SQL. Default is the current blog ID.
+ * @param int $blog_id Optional. The site ID for which to retrieve SQL. Default is the current site ID.
  * @return string The SQL needed to create the requested tables.
  */
 function wp_get_db_schema( $scope = 'all', $blog_id = null ) {
@@ -397,7 +397,7 @@ function populate_options() {
 	'siteurl' => $guessurl,
 	'home' => $guessurl,
 	'blogname' => __('My Site'),
-	/* translators: blog tagline */
+	/* translators: site tagline */
 	'blogdescription' => __('Just another WordPress site'),
 	'users_can_register' => 0,
 	'admin_email' => '[email protected]',
@@ -529,7 +529,7 @@ function populate_options() {
 
 	// 3.0 multisite
 	if ( is_multisite() ) {
-		/* translators: blog tagline */
+		/* translators: site tagline */
 		$options[ 'blogdescription' ] = sprintf(__('Just another %s site'), get_current_site()->site_name );
 		$options[ 'permalink_structure' ] = '/%year%/%monthnum%/%day%/%postname%/';
 	}

wp-admin/includes/upgrade.php

@@ -27,10 +27,10 @@
  *
  * @since 2.1.0
  *
- * @param string $blog_title    Blog title.
+ * @param string $blog_title    Site title.
  * @param string $user_name     User's username.
  * @param string $user_email    User's email.
- * @param bool   $public        Whether blog is public.
+ * @param bool   $public        Whether site is public.
  * @param string $deprecated    Optional. Not used.
  * @param string $user_password Optional. User's chosen password. Default empty (random password).
  * @param string $language      Optional. Language chosen. Default empty.
@@ -64,7 +64,7 @@ function wp_install( $blog_title, $user_name, $user_email, $public, $deprecated
 
 	/*
 	 * Create default user. If the user already exists, the user tables are
-	 * being shared among blogs. Just set the role in that case.
+	 * being shared among sites. Just set the role in that case.
 	 */
 	$user_id = username_exists($user_name);
 	$user_password = trim($user_password);
@@ -359,8 +359,8 @@ function wp_install_maybe_enable_pretty_permalinks() {
  *
  * @since 2.1.0
  *
- * @param string $blog_title Blog title.
- * @param string $blog_url   Blog url.
+ * @param string $blog_title Site title.
+ * @param string $blog_url   Site url.
  * @param int    $user_id    User ID.
  * @param string $password   User's Password.
  */

wp-admin/network/upgrade.php

@@ -92,7 +92,7 @@
 			 *
 			 * @since MU
 			 *
-			 * @param int $blog_id The id of the blog.
+			 * @param int $blog_id The Site ID.
 			 */
 			do_action( 'wpmu_upgrade_site', $details[ 'blog_id' ] );
 		}

wp-includes/cache.php

@@ -209,7 +209,7 @@ function wp_cache_set( $key, $data, $group = '', $expire = 0 ) {
  * @see WP_Object_Cache::switch_to_blog()
  * @global WP_Object_Cache $wp_object_cache Object cache global instance.
  *
- * @param int $blog_id Blog ID.
+ * @param int $blog_id Site ID.
  */
 function wp_cache_switch_to_blog( $blog_id ) {
 	global $wp_object_cache;