Changeset 41200

Timestamp:

08/01/2017 08:43:25 PM (9 years ago)

Author:

DrewAPicture

Message:

Docs: Reduce confusion in @since MU notationss by indicating the WP version (3.0.0) the code was merged into core while retaining the original context.

Props sathyapulse.
Fixes #41509.

Location:

trunk/src

Files:

• wp-activate.php (modified) (2 diffs)
• wp-admin/includes/class-wp-ms-sites-list-table.php (modified) (2 diffs)
• wp-admin/includes/class-wp-ms-users-list-table.php (modified) (1 diff)
• wp-admin/includes/dashboard.php (modified) (3 diffs)
• wp-admin/includes/ms.php (modified) (10 diffs)
• wp-admin/menu-header.php (modified) (1 diff)
• wp-admin/my-sites.php (modified) (2 diffs)
• wp-admin/network/settings.php (modified) (3 diffs)
• wp-admin/network/sites.php (modified) (2 diffs)
• wp-admin/network/upgrade.php (modified) (3 diffs)
• wp-includes/class-wp-theme.php (modified) (1 diff)
• wp-includes/deprecated.php (modified) (1 diff)
• wp-includes/ms-blogs.php (modified) (27 diffs)
• wp-includes/ms-deprecated.php (modified) (16 diffs)
• wp-includes/ms-functions.php (modified) (73 diffs)
• wp-includes/user.php (modified) (4 diffs)
• wp-signup.php (modified) (17 diffs)

trunk/src/wp-activate.php

@@ -37 +37 @@
  * Fires on {@see 'wp_head'}.
  *
- * @since MU
+ * @since MU (3.0.0)
  */
 function do_activate_header() {
@@ -54 +54 @@
  * Loads styles specific to this page.
  *
- * @since MU
+ * @since MU (3.0.0)
  */
 function wpmu_activate_stylesheet() {

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

@@ -237 +237 @@
                  * Filters the displayed site columns in Sites list table.
                  *
-                 * @since MU
+                 * @since MU (3.0.0)
                  *
                  * @param array $sites_columns An array of displayed site columns. Default 'cb',
@@ -421 +421 @@
                          * By default this column is hidden unless something is hooked to the action.
                          *
-                         * @since MU
+                         * @since MU (3.0.0)
                          *
                          * @param int $blog_id The site ID.

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

@@ -175 +175 @@
                  * Filters the columns displayed in the Network Admin Users list table.
                  *
-                 * @since MU
+                 * @since MU (3.0.0)
                  *
                  * @param array $users_columns An array of user columns. Default 'cb', 'username',

trunk/src/wp-admin/includes/dashboard.php

@@ -420 +420 @@
                  * just before the user and site search form fields.
                  *
-                 * @since MU
+                 * @since MU (3.0.0)
                  *
                  * @param null $unused
@@ -446 +446 @@
          * Fires at the end of the 'Right Now' widget in the Network Admin dashboard.
          *
-         * @since MU
+         * @since MU (3.0.0)
          */
         do_action( 'mu_rightnow_end' );
@@ -453 +453 @@
          * Fires at the end of the 'Right Now' widget in the Network Admin dashboard.
          *
-         * @since MU
+         * @since MU (3.0.0)
          */
         do_action( 'mu_activity_box_end' );

trunk/src/wp-admin/includes/ms.php

@@ -73 +73 @@
          * Fires before a site is deleted.
          *
-         * @since MU
+         * @since MU (3.0.0)
          *
          * @param int  $blog_id The site ID.
@@ -117 +117 @@
                  * Filters the tables to drop when the site is deleted.
                  *
-                 * @since MU
+                 * @since MU (3.0.0)
                  *
                  * @param array $tables  The site tables to be dropped.
@@ -133 +133 @@
                  * Filters the upload base directory to delete when the site is deleted.
                  *
-                 * @since MU
+                 * @since MU (3.0.0)
                  *
                  * @param string $uploads['basedir'] Uploads path without subdirectory. @see wp_upload_dir()
@@ -222 +222 @@
          * Fires before a user is deleted from the network.
          *
-         * @since MU
+         * @since MU (3.0.0)
          *
          * @param int $id ID of the user about to be deleted from the network.
@@ -315 +315 @@
          * ###SITEURL###   The URL to the site.
          *
-         * @since MU
+         * @since MU (3.0.0)
          *
          * @param string $email_text      Text in the email.
@@ -339 +339 @@
  * Check whether a site has used its allotted upload space.
  *
- * @since MU
+ * @since MU (3.0.0)
  *
  * @param bool $echo Optional. If $echo is set and the quota is exceeded, a warning message is echoed. Default is true.
@@ -366 +366 @@
  * Displays the amount of disk space used by the current site. Not used in core.
  *
- * @since MU
+ * @since MU (3.0.0)
  */
 function display_space_usage() {
@@ -394 +394 @@
  * Get the remaining upload space for this site.
  *
- * @since MU
+ * @since MU (3.0.0)
  *
  * @param int $size Current max size in bytes
@@ -531 +531 @@
          * Filters the language codes.
          *
-         * @since MU
+         * @since MU (3.0.0)
          *
          * @param array  $lang_codes Key/value pair of language codes where key is the short version.
@@ -659 +659 @@
          * Filters the languages available in the dropdown.
          *
-         * @since MU
+         * @since MU (3.0.0)
          *
          * @param array $output     HTML output of the dropdown.

trunk/src/wp-admin/menu-header.php

@@ -32 +32 @@
  * Allows plugins to move sub-menu items around.
  *
- * @since MU
+ * @since MU (3.0.0)
  *
  * @param string $parent_file The parent file.

trunk/src/wp-admin/my-sites.php

@@ -96 +96 @@
          * to be added, either globally or for specific sites.
          *
-         * @since MU
+         * @since MU (3.0.0)
          *
          * @param string $settings_html The settings HTML markup. Default empty.
@@ -114 +114 @@
                  * Filters the row links displayed for each site on the My Sites screen.
                  *
-                 * @since MU
+                 * @since MU (3.0.0)
                  *
                  * @param string $string    The HTML site link markup.

trunk/src/wp-admin/network/settings.php

@@ -81 +81 @@
          * Fires after the network options are updated.
          *
-         * @since MU
+         * @since MU (3.0.0)
          */
         do_action( 'update_wpmu_options' );
@@ -371 +371 @@
                          * screen in their individual sites' dashboards.
                          *
-                         * @since MU
+                         * @since MU (3.0.0)
                          *
                          * @param array $admin_menus The menu items available.
@@ -394 +394 @@
                  * Fires at the end of the Network Settings form, before the submit button.
                  *
-                 * @since MU
+                 * @since MU (3.0.0)
                  */
                 do_action( 'wpmu_options' ); ?>

trunk/src/wp-admin/network/sites.php

@@ -230 +230 @@
                          * Fires after a network site is activated.
                          *
-                         * @since MU
+                         * @since MU (3.0.0)
                          *
                          * @param string $id The ID of the activated site.
@@ -241 +241 @@
                          * Fires before a network site is deactivated.
                          *
-                         * @since MU
+                         * @since MU (3.0.0)
                          *
                          * @param string $id The ID of the site being deactivated.

trunk/src/wp-admin/network/upgrade.php

@@ -95 +95 @@
                          * Fires after the Multisite DB upgrade for each site is complete.
                          *
-                         * @since MU
+                         * @since MU (3.0.0)
                          *
                          * @param array|WP_Error $response The upgrade response array or WP_Error on failure.
@@ -103 +103 @@
                          * Fires after each site has been upgraded.
                          *
-                         * @since MU
+                         * @since MU (3.0.0)
                          *
                          * @param int $site_id The Site ID.
@@ -134 +134 @@
                  * Fires before the footer on the network upgrade screen.
                  *
-                 * @since MU
+                 * @since MU (3.0.0)
                  */
                 do_action( 'wpmu_upgrade_page' );

trunk/src/wp-includes/class-wp-theme.php

@@ -1271 +1271 @@
                  * Filters the array of themes allowed on the network.
                  *
-                 * @since MU
+                 * @since MU (3.0.0)
                  *
                  * @param array $allowed_themes An array of theme stylesheet names.

trunk/src/wp-includes/deprecated.php

@@ -2799 +2799 @@
  * Checks if the current user belong to a given site.
  *
- * @since MU
+ * @since MU (3.0.0)
  * @deprecated 3.3.0 Use is_user_member_of_blog()
  * @see is_user_member_of_blog()

trunk/src/wp-includes/ms-blogs.php

@@ -6 +6 @@
  * @package WordPress
  * @subpackage Multisite
- * @since MU
+ * @since MU (3.0.0)
  */
 
@@ -12 +12 @@
  * Update the last_updated field for the current site.
  *
- * @since MU
+ * @since MU (3.0.0)
  *
  * @global wpdb $wpdb WordPress database abstraction object.
@@ -23 +23 @@
          * Fires after the blog details are updated.
          *
-         * @since MU
+         * @since MU (3.0.0)
          *
          * @param int $blog_id Site ID.
@@ -33 +33 @@
  * Get a full blog URL, given a blog id.
  *
- * @since MU
+ * @since MU (3.0.0)
  *
  * @param int $blog_id Blog ID
@@ -54 +54 @@
  * Get a full blog URL, given a blog name.
  *
- * @since MU
+ * @since MU (3.0.0)
  *
  * @param string $blogname The (subdomain or directory) name
@@ -75 +75 @@
  * Retrieves a sites ID given its (subdomain or directory) slug.
  *
- * @since MU
+ * @since MU (3.0.0)
  * @since 4.7.0 Converted to use get_sites().
  *
@@ -110 +110 @@
  * Retrieve the details for a blog from the blogs table and blog options.
  *
- * @since MU
+ * @since MU (3.0.0)
  *
  * @global wpdb $wpdb WordPress database abstraction object.
@@ -240 +240 @@
          * Filters a blog's details.
          *
-         * @since MU
+         * @since MU (3.0.0)
          * @deprecated 4.7.0 Use site_details
          *
@@ -258 +258 @@
  * Clear the blog details cache.
  *
- * @since MU
+ * @since MU (3.0.0)
  *
  * @param int $blog_id Optional. Blog ID. Defaults to current blog.
@@ -295 +295 @@
  * Update the details for a blog. Updates the blogs table for a given blog id.
  *
- * @since MU
+ * @since MU (3.0.0)
  *
  * @global wpdb $wpdb WordPress database abstraction object.
@@ -342 +342 @@
                          * Fires when the 'spam' status is added to a blog.
                          *
-                         * @since MU
+                         * @since MU (3.0.0)
                          *
                          * @param int $blog_id Blog ID.
@@ -351 +351 @@
                          * Fires when the 'spam' status is removed from a blog.
                          *
-                         * @since MU
+                         * @since MU (3.0.0)
                          *
                          * @param int $blog_id Blog ID.
@@ -388 +388 @@
                          * Fires when the 'archived' status is added to a blog.
                          *
-                         * @since MU
+                         * @since MU (3.0.0)
                          *
                          * @param int $blog_id Blog ID.
@@ -397 +397 @@
                          * Fires when the 'archived' status is removed from a blog.
                          *
-                         * @since MU
+                         * @since MU (3.0.0)
                          *
                          * @param int $blog_id Blog ID.
@@ -649 +649 @@
  * If the option was serialized then it will be unserialized when it is returned.
  *
- * @since MU
+ * @since MU (3.0.0)
  *
  * @param int    $id      A blog ID. Can be null to refer to the current blog.
@@ -694 +694 @@
  * options the same as the ones which are protected.
  *
- * @since MU
+ * @since MU (3.0.0)
  *
  * @param int    $id     A blog ID. Can be null to refer to the current blog.
@@ -720 +720 @@
  * Removes option by name for a given blog id. Prevents removal of protected WordPress options.
  *
- * @since MU
+ * @since MU (3.0.0)
  *
  * @param int    $id     A blog ID. Can be null to refer to the current blog.
@@ -745 +745 @@
  * Update an option for a particular blog.
  *
- * @since MU
+ * @since MU (3.0.0)
  *
  * @param int    $id         The blog id.
@@ -780 +780 @@
  *
  * @see restore_current_blog()
- * @since MU
+ * @since MU (3.0.0)
  *
  * @global wpdb            $wpdb
@@ -812 +812 @@
                  * Fires when the blog is switched.
                  *
-                 * @since MU
+                 * @since MU (3.0.0)
                  *
                  * @param int $new_blog New blog ID.
@@ -866 +866 @@
  *
  * @see switch_to_blog()
- * @since MU
+ * @since MU (3.0.0)
  *
  * @global wpdb            $wpdb
@@ -954 +954 @@
  * Check if a particular blog is archived.
  *
- * @since MU
+ * @since MU (3.0.0)
  *
  * @param int $id The blog id
@@ -966 +966 @@
  * Update the 'archived' status of a particular blog.
  *
- * @since MU
+ * @since MU (3.0.0)
  *
  * @param int    $id       The blog id
@@ -980 +980 @@
  * Update a blog details field.
  *
- * @since MU
+ * @since MU (3.0.0)
  *
  * @global wpdb $wpdb WordPress database abstraction object.
@@ -1042 +1042 @@
                  * Fires after the current blog's 'public' setting is updated.
                  *
-                 * @since MU
+                 * @since MU (3.0.0)
                  *
                  * @param int    $blog_id Blog ID.
@@ -1056 +1056 @@
  * Get a blog details field.
  *
- * @since MU
+ * @since MU (3.0.0)
  *
  * @global wpdb $wpdb WordPress database abstraction object.
@@ -1077 +1077 @@
  * Get a list of most recently updated blogs.
  *
- * @since MU
+ * @since MU (3.0.0)
  *
  * @global wpdb $wpdb WordPress database abstraction object.

trunk/src/wp-includes/ms-deprecated.php

@@ -18 +18 @@
  * Dashboard blog functionality was removed in WordPress 3.1, replaced by the user admin.
  *
- * @since MU
+ * @since MU (3.0.0)
  * @deprecated 3.1.0 Use get_site()
  * @see get_site()
@@ -36 +36 @@
  * Generates a random password.
  *
- * @since MU
+ * @since MU (3.0.0)
  * @deprecated 3.0.0 Use wp_generate_password()
  * @see wp_generate_password()
@@ -56 +56 @@
  * legacy function_exists() checks to determine if multisite is enabled.
  *
- * @since MU
+ * @since MU (3.0.0)
  * @deprecated 3.0.0 Use is_super_admin()
  * @see is_super_admin()
@@ -83 +83 @@
  * Deprecated functionality to gracefully fail.
  *
- * @since MU
+ * @since MU (3.0.0)
  * @deprecated 3.0.0 Use wp_die()
  * @see wp_die()
@@ -121 +121 @@
  * Deprecated functionality to retrieve user information.
  *
- * @since MU
+ * @since MU (3.0.0)
  * @deprecated 3.0.0 Use get_user_by()
  * @see get_user_by()
@@ -135 +135 @@
  * Deprecated functionality to clear the global post cache.
  *
- * @since MU
+ * @since MU (3.0.0)
  * @deprecated 3.0.0 Use clean_post_cache()
  * @see clean_post_cache()
@@ -148 +148 @@
  * Deprecated functionality to determin if the current site is the main site.
  *
- * @since MU
+ * @since MU (3.0.0)
  * @deprecated 3.0.0 Use is_main_site()
  * @see is_main_site()
@@ -160 +160 @@
  * Deprecated functionality to validate an email address.
  *
- * @since MU
+ * @since MU (3.0.0)
  * @deprecated 3.0.0 Use is_email()
  * @see is_email()
@@ -176 +176 @@
  * Deprecated functionality to retrieve a list of all sites.
  *
- * @since MU
+ * @since MU (3.0.0)
  * @deprecated 3.0.0 Use wp_get_sites()
  * @see wp_get_sites()
@@ -210 +210 @@
  * Deprecated functionality to retrieve a list of the most active sites.
  *
- * @since MU
+ * @since MU (3.0.0)
  * @deprecated 3.0.0
  *
@@ -262 +262 @@
  * 6) $url
  *
- * @since MU
+ * @since MU (3.0.0)
  * @deprecated 3.3.0 Use wp_redirect()
  * @see wp_redirect()
@@ -301 +301 @@
  * Adds an 'updated=true' argument to a URL.
  *
- * @since MU
+ * @since MU (3.0.0)
  * @deprecated 3.3.0 Use add_query_arg()
  * @see add_query_arg()
@@ -326 +326 @@
  * and is simply returned as such.
  *
- * @since MU
+ * @since MU (3.0.0)
  * @deprecated 3.6.0 Use get_user_by()
  * @see get_user_by()
@@ -351 +351 @@
  * Get a full blog URL, given a domain and a path.
  *
- * @since MU
+ * @since MU (3.0.0)
  * @deprecated 3.7.0
  *
@@ -380 +380 @@
  * Create an empty blog.
  *
- * @since MU 1.0
+ * @since MU (3.0.0) 1.0
  * @deprecated 4.4.0
  *
@@ -416 +416 @@
  * Get the admin for a domain/path combination.
  *
- * @since MU 1.0
+ * @since MU (3.0.0) 1.0
  * @deprecated 4.4.0
  *

trunk/src/wp-includes/ms-functions.php

@@ -11 +11 @@
  * Gets the network's site and user counts.
  *
- * @since MU 1.0
+ * @since MU (3.0.0) 1.0
  *
  * @return array Site and user count for the network.
@@ -33 +33 @@
  * is returned.
  *
- * @since MU 1.0
+ * @since MU (3.0.0) 1.0
  *
  * @global wpdb $wpdb WordPress database abstraction object.
@@ -96 +96 @@
  * The count is cached and updated twice daily. This is not a live count.
  *
- * @since MU 2.7
+ * @since MU (3.0.0) 2.7
  * @since 4.8.0 The $network_id parameter has been added.
  *
@@ -111 +111 @@
  * The count is cached and updated twice daily. This is not a live count.
  *
- * @since MU 1.0
+ * @since MU (3.0.0) 1.0
  * @since 3.7.0 The $network_id parameter has been deprecated.
  * @since 4.8.0 The $network_id parameter is now being used.
@@ -125 +125 @@
  * Get a blog post from any site on the network.
  *
- * @since MU 1.0
+ * @since MU (3.0.0) 1.0
  *
  * @param int $blog_id ID of the blog.
@@ -144 +144 @@
  * Use the {@see 'add_user_to_blog'} action to fire an event when users are added to a blog.
  *
- * @since MU 1.0
+ * @since MU (3.0.0) 1.0
  *
  * @param int    $blog_id ID of the blog you're adding the user to.
@@ -172 +172 @@
          * Fires immediately after a user is added to a site.
          *
-         * @since MU
+         * @since MU (3.0.0)
          *
          * @param int    $user_id User ID.
@@ -194 +194 @@
  * reassign the user's blog posts to another user upon removal.
  *
- * @since MU 1.0
+ * @since MU (3.0.0) 1.0
  *
  * @global wpdb $wpdb WordPress database abstraction object.
@@ -210 +210 @@
          * Fires before a user is removed from a site.
          *
-         * @since MU
+         * @since MU (3.0.0)
          *
          * @param int $user_id User ID.
@@ -275 +275 @@
  * Get the permalink for a post on another blog.
  *
- * @since MU 1.0
+ * @since MU (3.0.0) 1.0
  *
  * @param int $blog_id ID of the source blog.
@@ -297 +297 @@
  * $domain is 'blog1.example.com' and $path is '/'.
  *
- * @since MU 2.6.5
+ * @since MU (3.0.0) 2.6.5
  *
  * @global wpdb $wpdb WordPress database abstraction object.
@@ -343 +343 @@
  * bypasses this check.
  *
- * @since MU
+ * @since MU (3.0.0)
  *
  * @param string $user_email The email provided by the user at registration.
@@ -401 +401 @@
  * necessary.
  *
- * @since MU
+ * @since MU (3.0.0)
  *
  * @global wpdb $wpdb WordPress database abstraction object.
@@ -507 +507 @@
          * registration. The values are solely used for validation and error handling.
          *
-         * @since MU
+         * @since MU (3.0.0)
          *
          * @param array $result {
@@ -535 +535 @@
  * the way that WordPress validates new site signups.
  *
- * @since MU
+ * @since MU (3.0.0)
  *
  * @global wpdb   $wpdb
@@ -606 +606 @@
          * path depending on the network settings.
          *
-         * @since MU
+         * @since MU (3.0.0)
          *
          * @param string $blogname Site name.
@@ -649 +649 @@
          * Filters site details and error messages following registration.
          *
-         * @since MU
+         * @since MU (3.0.0)
          *
          * @param array $result {
@@ -668 +668 @@
  * Record site signup information for future activation.
  *
- * @since MU
+ * @since MU (3.0.0)
  *
  * @global wpdb $wpdb WordPress database abstraction object.
@@ -734 +734 @@
  * new site registration is not.
  *
- * @since MU
+ * @since MU (3.0.0)
  *
  * @global wpdb $wpdb WordPress database abstraction object.
@@ -801 +801 @@
  * and subject line of the email sent to newly registered users.
  *
- * @since MU
+ * @since MU (3.0.0)
  *
  * @param string $domain     The new blog domain.
@@ -816 +816 @@
          * Filters whether to bypass the new site email notification.
          *
-         * @since MU
+         * @since MU (3.0.0)
          *
          * @param string|bool $domain     Site domain.
@@ -852 +852 @@
                  * Content should be formatted for transmission via wp_mail().
                  *
-                 * @since MU
+                 * @since MU (3.0.0)
                  *
                  * @param string $content    Content of the notification email.
@@ -876 +876 @@
                  * Filters the subject of the new blog notification email.
                  *
-                 * @since MU
+                 * @since MU (3.0.0)
                  *
                  * @param string $subject    Subject of the notification email.
@@ -917 +917 @@
  * and subject line of the email sent to newly registered users.
  *
- * @since MU
+ * @since MU (3.0.0)
  *
  * @param string $user_login The user's login name.
@@ -929 +929 @@
          * Filters whether to bypass the email notification for new user sign-up.
          *
-         * @since MU
+         * @since MU (3.0.0)
          *
          * @param string $user_login User login name.
@@ -954 +954 @@
                  * Content should be formatted for transmission via wp_mail().
                  *
-                 * @since MU
+                 * @since MU (3.0.0)
                  *
                  * @param string $content    Content of the notification email.
@@ -973 +973 @@
                  * Filters the subject of the notification email of new user signup.
                  *
-                 * @since MU
+                 * @since MU (3.0.0)
                  *
                  * @param string $subject    Subject of the notification email.
@@ -1006 +1006 @@
  * by a Super Admin).
  *
- * @since MU
+ * @since MU (3.0.0)
  *
  * @global wpdb $wpdb WordPress database abstraction object.
@@ -1052 +1052 @@
                  * Fires immediately after a new user is activated.
                  *
-                 * @since MU
+                 * @since MU (3.0.0)
                  *
                  * @param int   $user_id  User ID.
@@ -1079 +1079 @@
          * Fires immediately after a site is activated.
          *
-         * @since MU
+         * @since MU (3.0.0)
          *
          * @param int    $blog_id       Blog ID.
@@ -1100 +1100 @@
  * use {@see'user_register'}).
  *
- * @since MU
+ * @since MU (3.0.0)
  *
  * @param string $user_name The new user's login name.
@@ -1121 +1121 @@
          * Fires immediately after a new user is created.
          *
-         * @since MU
+         * @since MU (3.0.0)
          *
          * @param int $user_id User ID.
@@ -1142 +1142 @@
  * root domain (eg 'blog1.example.com'), and $path is '/'.
  *
- * @since MU
+ * @since MU (3.0.0)
  *
  * @param string $domain  The new site's domain.
@@ -1207 +1207 @@
          * Fires immediately after a new site is created.
          *
-         * @since MU
+         * @since MU (3.0.0)
          *
          * @param int    $blog_id Site ID.
@@ -1229 +1229 @@
  * the notification email.
  *
- * @since MU
+ * @since MU (3.0.0)
  *
  * @param int    $blog_id    The new site's ID.
@@ -1260 +1260 @@
          * to the network administrator.
          *
-         * @since MU
+         * @since MU (3.0.0)
          *
          * @param string $msg Email body.
@@ -1276 +1276 @@
  * the notification email.
  *
- * @since MU
+ * @since MU (3.0.0)
  *
  * @param int $user_id The new user's ID.
@@ -1303 +1303 @@
          * to the network administrator.
          *
-         * @since MU
+         * @since MU (3.0.0)
          *
          * @param string  $msg  Email body.
@@ -1319 +1319 @@
  * that each blogname is unique.
  *
- * @since MU
+ * @since MU (3.0.0)
  *
  * @global wpdb $wpdb WordPress database abstraction object.
@@ -1358 +1358 @@
  * the new blog's ID. It is the first step in creating a new blog.
  *
- * @since MU
+ * @since MU (3.0.0)
  *
  * @global wpdb $wpdb WordPress database abstraction object.
@@ -1392 +1392 @@
  * points to the new blog.
  *
- * @since MU
+ * @since MU (3.0.0)
  *
  * @global wpdb     $wpdb
@@ -1458 +1458 @@
  * This function creates a row in the wp_blogs table.
  *
- * @since MU
+ * @since MU (3.0.0)
  * @deprecated MU
  * @deprecated Use wp_install_defaults()
@@ -1487 +1487 @@
  * modify the content and subject line of the notification email.
  *
- * @since MU
+ * @since MU (3.0.0)
  *
  * @param int    $blog_id  Blog ID.
@@ -1504 +1504 @@
          * Returning false disables the welcome email.
          *
-         * @since MU
+         * @since MU (3.0.0)
          *
          * @param int|bool $blog_id  Blog ID.
@@ -1551 +1551 @@
          * Content should be formatted for transmission via wp_mail().
          *
-         * @since MU
+         * @since MU (3.0.0)
          *
          * @param string $welcome_email Message body of the email.
@@ -1579 +1579 @@
          * Filters the subject of the welcome email after site activation.
          *
-         * @since MU
+         * @since MU (3.0.0)
          *
          * @param string $subject Subject of the email.
@@ -1601 +1601 @@
  * modify the content and subject line of the notification email.
  *
- * @since MU
+ * @since MU (3.0.0)
  *
  * @param int    $user_id  User ID.
@@ -1616 +1616 @@
          * Returning false disables the welcome email.
          *
-         * @since MU
+         * @since MU (3.0.0)
          *
          * @param int    $user_id  User ID.
@@ -1636 +1636 @@
          * Content should be formatted for transmission via wp_mail().
          *
-         * @since MU
+         * @since MU (3.0.0)
          *
          * @param string $welcome_email The message body of the account activation success email.
@@ -1667 +1667 @@
          * Filters the subject of the welcome email after user activation.
          *
-         * @since MU
+         * @since MU (3.0.0)
          *
          * @param string $subject Subject of the email.
@@ -1689 +1689 @@
  * @see wpmu_current_site()
  *
- * @since MU
+ * @since MU (3.0.0)
  *
  * @global WP_Network $current_site
@@ -1706 +1706 @@
  * the most recent post_date_gmt.
  *
- * @since MU
+ * @since MU (3.0.0)
  *
  * @global wpdb $wpdb WordPress database abstraction object.
@@ -1754 +1754 @@
  * a blog has exceeded its allowed upload space.
  *
- * @since MU
+ * @since MU (3.0.0)
  *
  * @param string $directory Full path of a directory.
@@ -1785 +1785 @@
  * other directories.
  *
- * @since MU
+ * @since MU (3.0.0)
  * @since 4.3.0 $exclude parameter added.
  *
@@ -1828 +1828 @@
  * Super Admins at wp-admin/network/settings.php.
  *
- * @since MU
+ * @since MU (3.0.0)
  *
  * @param array $mimes
@@ -1853 +1853 @@
  * or unpublished to make sure the count stays current.
  *
- * @since MU
+ * @since MU (3.0.0)
  *
  * @global wpdb $wpdb WordPress database abstraction object.
@@ -1867 +1867 @@
  * Logs the user email, IP, and registration date of a new site.
  *
- * @since MU
+ * @since MU (3.0.0)
  *
  * @global wpdb $wpdb WordPress database abstraction object.
@@ -1959 +1959 @@
  *
  * @see wp_validate_redirect()
- * @since MU
+ * @since MU (3.0.0)
  *
  * @param array|string $deprecated Not used.
@@ -1971 +1971 @@
  * Check whether an upload is too big.
  *
- * @since MU
+ * @since MU (3.0.0)
  *
  * @blessed
@@ -1992 +1992 @@
  * Add a nonce field to the signup page.
  *
- * @since MU
+ * @since MU (3.0.0)
  */
 function signup_nonce_fields() {
@@ -2003 +2003 @@
  * Process the signup nonce created in signup_nonce_fields().
  *
- * @since MU
+ * @since MU (3.0.0)
  *
  * @param array $result
@@ -2021 +2021 @@
  * Correct 404 redirects when NOBLOGREDIRECT is defined.
  *
- * @since MU
+ * @since MU (3.0.0)
  */
 function maybe_redirect_404() {
@@ -2048 +2048 @@
  * added, as when a user is invited through the regular WP Add User interface.
  *
- * @since MU
+ * @since MU (3.0.0)
  */
 function maybe_add_existing_user_to_blog() {
@@ -2073 +2073 @@
  * Add a user to a blog based on details from maybe_add_existing_user_to_blog().
  *
- * @since MU
+ * @since MU (3.0.0)
  *
  * @param array $details
@@ -2085 +2085 @@
                  * Fires immediately after an existing user is added to a site.
                  *
-                 * @since MU
+                 * @since MU (3.0.0)
                  *
                  * @param int   $user_id User ID.
@@ -2101 +2101 @@
  * is specifically hooked into the {@see 'wpmu_activate_user'} action.
  *
- * @since MU
+ * @since MU (3.0.0)
  * @see add_user_to_blog()
  *
@@ -2121 +2121 @@
  * Correct From host on outgoing mail to match the site domain
  *
- * @since MU
+ * @since MU (3.0.0)
  *
  * @param PHPMailer $phpmailer The PHPMailer instance, passed by reference.
@@ -2132 +2132 @@
  * Check to see whether a user is marked as a spammer, based on user login.
  *
- * @since MU
+ * @since MU (3.0.0)
  *
  * @param string|WP_User $user Optional. Defaults to current user. WP_User object,
@@ -2155 +2155 @@
  * Public blogs have a setting of 1, private blogs are 0.
  *
- * @since MU
+ * @since MU (3.0.0)
  *
  * @param int $old_value
@@ -2167 +2167 @@
  * Check whether a usermeta key has to do with the current blog.
  *
- * @since MU
+ * @since MU (3.0.0)
  *
  * @global wpdb $wpdb WordPress database abstraction object.
@@ -2191 +2191 @@
  * Check whether users can self-register, based on Network settings.
  *
- * @since MU
+ * @since MU (3.0.0)
  *
  * @return bool
@@ -2203 +2203 @@
  * Ensure that the welcome message is not empty. Currently unused.
  *
- * @since MU
+ * @since MU (3.0.0)
  *
  * @param string $text
@@ -2418 +2418 @@
  * Returns the upload quota for the current blog.
  *
- * @since MU
+ * @since MU (3.0.0)
  *
  * @return int Quota in megabytes

trunk/src/wp-includes/user.php

@@ -424 +424 @@
  * Get the current user's ID
  *
- * @since MU
+ * @since MU (3.0.0)
  *
  * @return int The current user's ID, or 0 if no user is logged in.
@@ -680 +680 @@
          * Filters the list of sites a user belongs to.
          *
-         * @since MU
+         * @since MU (3.0.0)
          *
          * @param array $sites   An array of site objects belonging to the user.
@@ -693 +693 @@
  * Find out whether a user is a member of a given blog.
  *
- * @since MU 1.1
+ * @since MU (3.0.0) 1.1
  *
  * @global wpdb $wpdb WordPress database abstraction object.
@@ -2670 +2670 @@
                  * ###SITEURL###   The URL to the site.
                  *
-                 * @since MU
+                 * @since MU (3.0.0)
                  * @since 4.9.0 This filter is no longer Multisite specific.
                  *

trunk/src/wp-signup.php

@@ -16 +16 @@
  * Prints signup_header via wp_head
  *
- * @since MU
+ * @since MU (3.0.0)
  */
 function do_signup_header() {
@@ -51 +51 @@
  * Prints styles for front-end Multisite signup pages
  *
- * @since MU
+ * @since MU (3.0.0)
  */
 function wpmu_signup_stylesheet() {
@@ -90 +90 @@
  * Generates and displays the Signup and Create Site forms
  *
- * @since MU
+ * @since MU (3.0.0)
  *
  * @param string          $blogname   The new site name.
@@ -199 +199 @@
  * Validate the new site signup
  *
- * @since MU
+ * @since MU (3.0.0)
  *
  * @return array Contains the new site data and error messages.
@@ -214 +214 @@
  * Display user registration form
  *
- * @since MU
+ * @since MU (3.0.0)
  *
  * @param string          $user_name  The entered username.
@@ -256 +256 @@
  * Validate user signup name and email
  *
- * @since MU
+ * @since MU (3.0.0)
  *
  * @return array Contains username, email, and error messages.
@@ -267 +267 @@
  * Allow returning users to sign up for another site
  *
- * @since MU
+ * @since MU (3.0.0)
  *
  * @param string          $blogname   The new site name
@@ -333 +333 @@
                  * Hidden sign-up form fields output when creating another site or user.
                  *
-                 * @since MU
+                 * @since MU (3.0.0)
                  *
                  * @param string $context A string describing the steps of the sign-up process. The value can be
@@ -349 +349 @@
  * Validate a new site signup.
  *
- * @since MU
+ * @since MU (3.0.0)
  *
  * @return null|bool True if site signup was validated, false if error.
@@ -402 +402 @@
          * Use the {@see 'add_signup_meta'} filter instead.
          *
-         * @since MU
+         * @since MU (3.0.0)
          * @deprecated 3.0.0 Use the {@see 'add_signup_meta'} filter instead.
          *
@@ -436 +436 @@
  * Confirm a new site signup.
  *
- * @since MU
+ * @since MU (3.0.0)
  * @since 4.4.0 Added the `$blog_id` parameter.
  *
@@ -491 +491 @@
  * Setup the new user signup process
  *
- * @since MU
+ * @since MU (3.0.0)
  *
  * @param string          $user_name  The username.
@@ -565 +565 @@
  * Validate the new user signup
  *
- * @since MU
+ * @since MU (3.0.0)
  *
  * @return bool True if new user signup was validated, false if error
@@ -595 +595 @@
  * New user signup confirmation
  *
- * @since MU
+ * @since MU (3.0.0)
  *
  * @param string $user_name The username
@@ -616 +616 @@
  * Setup the new site signup
  *
- * @since MU
+ * @since MU (3.0.0)
  *
  * @param string          $user_name  The username.
@@ -679 +679 @@
  * Validate new site signup
  *
- * @since MU
+ * @since MU (3.0.0)
  *
  * @return bool True if the site signup was validated, false if error
@@ -736 +736 @@
  * New site signup confirmation
  *
- * @since MU
+ * @since MU (3.0.0)
  *
  * @param string $domain The domain URL