Make WordPress Core

Changeset 41200


Ignore:
Timestamp:
08/01/2017 08:43:25 PM (7 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:
17 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/wp-activate.php

    r38664 r41200  
    3737 * Fires on {@see 'wp_head'}.
    3838 *
    39  * @since MU
     39 * @since MU (3.0.0)
    4040 */
    4141function do_activate_header() {
     
    5454 * Loads styles specific to this page.
    5555 *
    56  * @since MU
     56 * @since MU (3.0.0)
    5757 */
    5858function wpmu_activate_stylesheet() {
  • trunk/src/wp-admin/includes/class-wp-ms-sites-list-table.php

    r41161 r41200  
    237237         * Filters the displayed site columns in Sites list table.
    238238         *
    239          * @since MU
     239         * @since MU (3.0.0)
    240240         *
    241241         * @param array $sites_columns An array of displayed site columns. Default 'cb',
     
    421421             * By default this column is hidden unless something is hooked to the action.
    422422             *
    423              * @since MU
     423             * @since MU (3.0.0)
    424424             *
    425425             * @param int $blog_id The site ID.
  • trunk/src/wp-admin/includes/class-wp-ms-users-list-table.php

    r41161 r41200  
    175175         * Filters the columns displayed in the Network Admin Users list table.
    176176         *
    177          * @since MU
     177         * @since MU (3.0.0)
    178178         *
    179179         * @param array $users_columns An array of user columns. Default 'cb', 'username',
  • trunk/src/wp-admin/includes/dashboard.php

    r40948 r41200  
    420420         * just before the user and site search form fields.
    421421         *
    422          * @since MU
     422         * @since MU (3.0.0)
    423423         *
    424424         * @param null $unused
     
    446446     * Fires at the end of the 'Right Now' widget in the Network Admin dashboard.
    447447     *
    448      * @since MU
     448     * @since MU (3.0.0)
    449449     */
    450450    do_action( 'mu_rightnow_end' );
     
    453453     * Fires at the end of the 'Right Now' widget in the Network Admin dashboard.
    454454     *
    455      * @since MU
     455     * @since MU (3.0.0)
    456456     */
    457457    do_action( 'mu_activity_box_end' );
  • trunk/src/wp-admin/includes/ms.php

    r41163 r41200  
    7373     * Fires before a site is deleted.
    7474     *
    75      * @since MU
     75     * @since MU (3.0.0)
    7676     *
    7777     * @param int  $blog_id The site ID.
     
    117117         * Filters the tables to drop when the site is deleted.
    118118         *
    119          * @since MU
     119         * @since MU (3.0.0)
    120120         *
    121121         * @param array $tables  The site tables to be dropped.
     
    133133         * Filters the upload base directory to delete when the site is deleted.
    134134         *
    135          * @since MU
     135         * @since MU (3.0.0)
    136136         *
    137137         * @param string $uploads['basedir'] Uploads path without subdirectory. @see wp_upload_dir()
     
    222222     * Fires before a user is deleted from the network.
    223223     *
    224      * @since MU
     224     * @since MU (3.0.0)
    225225     *
    226226     * @param int $id ID of the user about to be deleted from the network.
     
    315315     * ###SITEURL###   The URL to the site.
    316316     *
    317      * @since MU
     317     * @since MU (3.0.0)
    318318     *
    319319     * @param string $email_text      Text in the email.
     
    339339 * Check whether a site has used its allotted upload space.
    340340 *
    341  * @since MU
     341 * @since MU (3.0.0)
    342342 *
    343343 * @param bool $echo Optional. If $echo is set and the quota is exceeded, a warning message is echoed. Default is true.
     
    366366 * Displays the amount of disk space used by the current site. Not used in core.
    367367 *
    368  * @since MU
     368 * @since MU (3.0.0)
    369369 */
    370370function display_space_usage() {
     
    394394 * Get the remaining upload space for this site.
    395395 *
    396  * @since MU
     396 * @since MU (3.0.0)
    397397 *
    398398 * @param int $size Current max size in bytes
     
    531531     * Filters the language codes.
    532532     *
    533      * @since MU
     533     * @since MU (3.0.0)
    534534     *
    535535     * @param array  $lang_codes Key/value pair of language codes where key is the short version.
     
    659659     * Filters the languages available in the dropdown.
    660660     *
    661      * @since MU
     661     * @since MU (3.0.0)
    662662     *
    663663     * @param array $output     HTML output of the dropdown.
  • trunk/src/wp-admin/menu-header.php

    r39141 r41200  
    3232 * Allows plugins to move sub-menu items around.
    3333 *
    34  * @since MU
     34 * @since MU (3.0.0)
    3535 *
    3636 * @param string $parent_file The parent file.
  • trunk/src/wp-admin/my-sites.php

    r39551 r41200  
    9696     * to be added, either globally or for specific sites.
    9797     *
    98      * @since MU
     98     * @since MU (3.0.0)
    9999     *
    100100     * @param string $settings_html The settings HTML markup. Default empty.
     
    114114         * Filters the row links displayed for each site on the My Sites screen.
    115115         *
    116          * @since MU
     116         * @since MU (3.0.0)
    117117         *
    118118         * @param string $string    The HTML site link markup.
  • trunk/src/wp-admin/network/settings.php

    r40953 r41200  
    8181     * Fires after the network options are updated.
    8282     *
    83      * @since MU
     83     * @since MU (3.0.0)
    8484     */
    8585    do_action( 'update_wpmu_options' );
     
    371371             * screen in their individual sites' dashboards.
    372372             *
    373              * @since MU
     373             * @since MU (3.0.0)
    374374             *
    375375             * @param array $admin_menus The menu items available.
     
    394394         * Fires at the end of the Network Settings form, before the submit button.
    395395         *
    396          * @since MU
     396         * @since MU (3.0.0)
    397397         */
    398398        do_action( 'wpmu_options' ); ?>
  • trunk/src/wp-admin/network/sites.php

    r41131 r41200  
    230230             * Fires after a network site is activated.
    231231             *
    232              * @since MU
     232             * @since MU (3.0.0)
    233233             *
    234234             * @param string $id The ID of the activated site.
     
    241241             * Fires before a network site is deactivated.
    242242             *
    243              * @since MU
     243             * @since MU (3.0.0)
    244244             *
    245245             * @param string $id The ID of the site being deactivated.
  • trunk/src/wp-admin/network/upgrade.php

    r40404 r41200  
    9595             * Fires after the Multisite DB upgrade for each site is complete.
    9696             *
    97              * @since MU
     97             * @since MU (3.0.0)
    9898             *
    9999             * @param array|WP_Error $response The upgrade response array or WP_Error on failure.
     
    103103             * Fires after each site has been upgraded.
    104104             *
    105              * @since MU
     105             * @since MU (3.0.0)
    106106             *
    107107             * @param int $site_id The Site ID.
     
    134134         * Fires before the footer on the network upgrade screen.
    135135         *
    136          * @since MU
     136         * @since MU (3.0.0)
    137137         */
    138138        do_action( 'wpmu_upgrade_page' );
  • trunk/src/wp-includes/class-wp-theme.php

    r41162 r41200  
    12711271         * Filters the array of themes allowed on the network.
    12721272         *
    1273          * @since MU
     1273         * @since MU (3.0.0)
    12741274         *
    12751275         * @param array $allowed_themes An array of theme stylesheet names.
  • trunk/src/wp-includes/deprecated.php

    r40949 r41200  
    27992799 * Checks if the current user belong to a given site.
    28002800 *
    2801  * @since MU
     2801 * @since MU (3.0.0)
    28022802 * @deprecated 3.3.0 Use is_user_member_of_blog()
    28032803 * @see is_user_member_of_blog()
  • trunk/src/wp-includes/ms-blogs.php

    r40352 r41200  
    66 * @package WordPress
    77 * @subpackage Multisite
    8  * @since MU
     8 * @since MU (3.0.0)
    99 */
    1010
     
    1212 * Update the last_updated field for the current site.
    1313 *
    14  * @since MU
     14 * @since MU (3.0.0)
    1515 *
    1616 * @global wpdb $wpdb WordPress database abstraction object.
     
    2323     * Fires after the blog details are updated.
    2424     *
    25      * @since MU
     25     * @since MU (3.0.0)
    2626     *
    2727     * @param int $blog_id Site ID.
     
    3333 * Get a full blog URL, given a blog id.
    3434 *
    35  * @since MU
     35 * @since MU (3.0.0)
    3636 *
    3737 * @param int $blog_id Blog ID
     
    5454 * Get a full blog URL, given a blog name.
    5555 *
    56  * @since MU
     56 * @since MU (3.0.0)
    5757 *
    5858 * @param string $blogname The (subdomain or directory) name
     
    7575 * Retrieves a sites ID given its (subdomain or directory) slug.
    7676 *
    77  * @since MU
     77 * @since MU (3.0.0)
    7878 * @since 4.7.0 Converted to use get_sites().
    7979 *
     
    110110 * Retrieve the details for a blog from the blogs table and blog options.
    111111 *
    112  * @since MU
     112 * @since MU (3.0.0)
    113113 *
    114114 * @global wpdb $wpdb WordPress database abstraction object.
     
    240240     * Filters a blog's details.
    241241     *
    242      * @since MU
     242     * @since MU (3.0.0)
    243243     * @deprecated 4.7.0 Use site_details
    244244     *
     
    258258 * Clear the blog details cache.
    259259 *
    260  * @since MU
     260 * @since MU (3.0.0)
    261261 *
    262262 * @param int $blog_id Optional. Blog ID. Defaults to current blog.
     
    295295 * Update the details for a blog. Updates the blogs table for a given blog id.
    296296 *
    297  * @since MU
     297 * @since MU (3.0.0)
    298298 *
    299299 * @global wpdb $wpdb WordPress database abstraction object.
     
    342342             * Fires when the 'spam' status is added to a blog.
    343343             *
    344              * @since MU
     344             * @since MU (3.0.0)
    345345             *
    346346             * @param int $blog_id Blog ID.
     
    351351             * Fires when the 'spam' status is removed from a blog.
    352352             *
    353              * @since MU
     353             * @since MU (3.0.0)
    354354             *
    355355             * @param int $blog_id Blog ID.
     
    388388             * Fires when the 'archived' status is added to a blog.
    389389             *
    390              * @since MU
     390             * @since MU (3.0.0)
    391391             *
    392392             * @param int $blog_id Blog ID.
     
    397397             * Fires when the 'archived' status is removed from a blog.
    398398             *
    399              * @since MU
     399             * @since MU (3.0.0)
    400400             *
    401401             * @param int $blog_id Blog ID.
     
    649649 * If the option was serialized then it will be unserialized when it is returned.
    650650 *
    651  * @since MU
     651 * @since MU (3.0.0)
    652652 *
    653653 * @param int    $id      A blog ID. Can be null to refer to the current blog.
     
    694694 * options the same as the ones which are protected.
    695695 *
    696  * @since MU
     696 * @since MU (3.0.0)
    697697 *
    698698 * @param int    $id     A blog ID. Can be null to refer to the current blog.
     
    720720 * Removes option by name for a given blog id. Prevents removal of protected WordPress options.
    721721 *
    722  * @since MU
     722 * @since MU (3.0.0)
    723723 *
    724724 * @param int    $id     A blog ID. Can be null to refer to the current blog.
     
    745745 * Update an option for a particular blog.
    746746 *
    747  * @since MU
     747 * @since MU (3.0.0)
    748748 *
    749749 * @param int    $id         The blog id.
     
    780780 *
    781781 * @see restore_current_blog()
    782  * @since MU
     782 * @since MU (3.0.0)
    783783 *
    784784 * @global wpdb            $wpdb
     
    812812         * Fires when the blog is switched.
    813813         *
    814          * @since MU
     814         * @since MU (3.0.0)
    815815         *
    816816         * @param int $new_blog New blog ID.
     
    866866 *
    867867 * @see switch_to_blog()
    868  * @since MU
     868 * @since MU (3.0.0)
    869869 *
    870870 * @global wpdb            $wpdb
     
    954954 * Check if a particular blog is archived.
    955955 *
    956  * @since MU
     956 * @since MU (3.0.0)
    957957 *
    958958 * @param int $id The blog id
     
    966966 * Update the 'archived' status of a particular blog.
    967967 *
    968  * @since MU
     968 * @since MU (3.0.0)
    969969 *
    970970 * @param int    $id       The blog id
     
    980980 * Update a blog details field.
    981981 *
    982  * @since MU
     982 * @since MU (3.0.0)
    983983 *
    984984 * @global wpdb $wpdb WordPress database abstraction object.
     
    10421042         * Fires after the current blog's 'public' setting is updated.
    10431043         *
    1044          * @since MU
     1044         * @since MU (3.0.0)
    10451045         *
    10461046         * @param int    $blog_id Blog ID.
     
    10561056 * Get a blog details field.
    10571057 *
    1058  * @since MU
     1058 * @since MU (3.0.0)
    10591059 *
    10601060 * @global wpdb $wpdb WordPress database abstraction object.
     
    10771077 * Get a list of most recently updated blogs.
    10781078 *
    1079  * @since MU
     1079 * @since MU (3.0.0)
    10801080 *
    10811081 * @global wpdb $wpdb WordPress database abstraction object.
  • trunk/src/wp-includes/ms-deprecated.php

    r40929 r41200  
    1818 * Dashboard blog functionality was removed in WordPress 3.1, replaced by the user admin.
    1919 *
    20  * @since MU
     20 * @since MU (3.0.0)
    2121 * @deprecated 3.1.0 Use get_site()
    2222 * @see get_site()
     
    3636 * Generates a random password.
    3737 *
    38  * @since MU
     38 * @since MU (3.0.0)
    3939 * @deprecated 3.0.0 Use wp_generate_password()
    4040 * @see wp_generate_password()
     
    5656 * legacy function_exists() checks to determine if multisite is enabled.
    5757 *
    58  * @since MU
     58 * @since MU (3.0.0)
    5959 * @deprecated 3.0.0 Use is_super_admin()
    6060 * @see is_super_admin()
     
    8383 * Deprecated functionality to gracefully fail.
    8484 *
    85  * @since MU
     85 * @since MU (3.0.0)
    8686 * @deprecated 3.0.0 Use wp_die()
    8787 * @see wp_die()
     
    121121 * Deprecated functionality to retrieve user information.
    122122 *
    123  * @since MU
     123 * @since MU (3.0.0)
    124124 * @deprecated 3.0.0 Use get_user_by()
    125125 * @see get_user_by()
     
    135135 * Deprecated functionality to clear the global post cache.
    136136 *
    137  * @since MU
     137 * @since MU (3.0.0)
    138138 * @deprecated 3.0.0 Use clean_post_cache()
    139139 * @see clean_post_cache()
     
    148148 * Deprecated functionality to determin if the current site is the main site.
    149149 *
    150  * @since MU
     150 * @since MU (3.0.0)
    151151 * @deprecated 3.0.0 Use is_main_site()
    152152 * @see is_main_site()
     
    160160 * Deprecated functionality to validate an email address.
    161161 *
    162  * @since MU
     162 * @since MU (3.0.0)
    163163 * @deprecated 3.0.0 Use is_email()
    164164 * @see is_email()
     
    176176 * Deprecated functionality to retrieve a list of all sites.
    177177 *
    178  * @since MU
     178 * @since MU (3.0.0)
    179179 * @deprecated 3.0.0 Use wp_get_sites()
    180180 * @see wp_get_sites()
     
    210210 * Deprecated functionality to retrieve a list of the most active sites.
    211211 *
    212  * @since MU
     212 * @since MU (3.0.0)
    213213 * @deprecated 3.0.0
    214214 *
     
    262262 * 6) $url
    263263 *
    264  * @since MU
     264 * @since MU (3.0.0)
    265265 * @deprecated 3.3.0 Use wp_redirect()
    266266 * @see wp_redirect()
     
    301301 * Adds an 'updated=true' argument to a URL.
    302302 *
    303  * @since MU
     303 * @since MU (3.0.0)
    304304 * @deprecated 3.3.0 Use add_query_arg()
    305305 * @see add_query_arg()
     
    326326 * and is simply returned as such.
    327327 *
    328  * @since MU
     328 * @since MU (3.0.0)
    329329 * @deprecated 3.6.0 Use get_user_by()
    330330 * @see get_user_by()
     
    351351 * Get a full blog URL, given a domain and a path.
    352352 *
    353  * @since MU
     353 * @since MU (3.0.0)
    354354 * @deprecated 3.7.0
    355355 *
     
    380380 * Create an empty blog.
    381381 *
    382  * @since MU 1.0
     382 * @since MU (3.0.0) 1.0
    383383 * @deprecated 4.4.0
    384384 *
     
    416416 * Get the admin for a domain/path combination.
    417417 *
    418  * @since MU 1.0
     418 * @since MU (3.0.0) 1.0
    419419 * @deprecated 4.4.0
    420420 *
  • trunk/src/wp-includes/ms-functions.php

    r41164 r41200  
    1111 * Gets the network's site and user counts.
    1212 *
    13  * @since MU 1.0
     13 * @since MU (3.0.0) 1.0
    1414 *
    1515 * @return array Site and user count for the network.
     
    3333 * is returned.
    3434 *
    35  * @since MU 1.0
     35 * @since MU (3.0.0) 1.0
    3636 *
    3737 * @global wpdb $wpdb WordPress database abstraction object.
     
    9696 * The count is cached and updated twice daily. This is not a live count.
    9797 *
    98  * @since MU 2.7
     98 * @since MU (3.0.0) 2.7
    9999 * @since 4.8.0 The $network_id parameter has been added.
    100100 *
     
    111111 * The count is cached and updated twice daily. This is not a live count.
    112112 *
    113  * @since MU 1.0
     113 * @since MU (3.0.0) 1.0
    114114 * @since 3.7.0 The $network_id parameter has been deprecated.
    115115 * @since 4.8.0 The $network_id parameter is now being used.
     
    125125 * Get a blog post from any site on the network.
    126126 *
    127  * @since MU 1.0
     127 * @since MU (3.0.0) 1.0
    128128 *
    129129 * @param int $blog_id ID of the blog.
     
    144144 * Use the {@see 'add_user_to_blog'} action to fire an event when users are added to a blog.
    145145 *
    146  * @since MU 1.0
     146 * @since MU (3.0.0) 1.0
    147147 *
    148148 * @param int    $blog_id ID of the blog you're adding the user to.
     
    172172     * Fires immediately after a user is added to a site.
    173173     *
    174      * @since MU
     174     * @since MU (3.0.0)
    175175     *
    176176     * @param int    $user_id User ID.
     
    194194 * reassign the user's blog posts to another user upon removal.
    195195 *
    196  * @since MU 1.0
     196 * @since MU (3.0.0) 1.0
    197197 *
    198198 * @global wpdb $wpdb WordPress database abstraction object.
     
    210210     * Fires before a user is removed from a site.
    211211     *
    212      * @since MU
     212     * @since MU (3.0.0)
    213213     *
    214214     * @param int $user_id User ID.
     
    275275 * Get the permalink for a post on another blog.
    276276 *
    277  * @since MU 1.0
     277 * @since MU (3.0.0) 1.0
    278278 *
    279279 * @param int $blog_id ID of the source blog.
     
    297297 * $domain is 'blog1.example.com' and $path is '/'.
    298298 *
    299  * @since MU 2.6.5
     299 * @since MU (3.0.0) 2.6.5
    300300 *
    301301 * @global wpdb $wpdb WordPress database abstraction object.
     
    343343 * bypasses this check.
    344344 *
    345  * @since MU
     345 * @since MU (3.0.0)
    346346 *
    347347 * @param string $user_email The email provided by the user at registration.
     
    401401 * necessary.
    402402 *
    403  * @since MU
     403 * @since MU (3.0.0)
    404404 *
    405405 * @global wpdb $wpdb WordPress database abstraction object.
     
    507507     * registration. The values are solely used for validation and error handling.
    508508     *
    509      * @since MU
     509     * @since MU (3.0.0)
    510510     *
    511511     * @param array $result {
     
    535535 * the way that WordPress validates new site signups.
    536536 *
    537  * @since MU
     537 * @since MU (3.0.0)
    538538 *
    539539 * @global wpdb   $wpdb
     
    606606     * path depending on the network settings.
    607607     *
    608      * @since MU
     608     * @since MU (3.0.0)
    609609     *
    610610     * @param string $blogname Site name.
     
    649649     * Filters site details and error messages following registration.
    650650     *
    651      * @since MU
     651     * @since MU (3.0.0)
    652652     *
    653653     * @param array $result {
     
    668668 * Record site signup information for future activation.
    669669 *
    670  * @since MU
     670 * @since MU (3.0.0)
    671671 *
    672672 * @global wpdb $wpdb WordPress database abstraction object.
     
    734734 * new site registration is not.
    735735 *
    736  * @since MU
     736 * @since MU (3.0.0)
    737737 *
    738738 * @global wpdb $wpdb WordPress database abstraction object.
     
    801801 * and subject line of the email sent to newly registered users.
    802802 *
    803  * @since MU
     803 * @since MU (3.0.0)
    804804 *
    805805 * @param string $domain     The new blog domain.
     
    816816     * Filters whether to bypass the new site email notification.
    817817     *
    818      * @since MU
     818     * @since MU (3.0.0)
    819819     *
    820820     * @param string|bool $domain     Site domain.
     
    852852         * Content should be formatted for transmission via wp_mail().
    853853         *
    854          * @since MU
     854         * @since MU (3.0.0)
    855855         *
    856856         * @param string $content    Content of the notification email.
     
    876876         * Filters the subject of the new blog notification email.
    877877         *
    878          * @since MU
     878         * @since MU (3.0.0)
    879879         *
    880880         * @param string $subject    Subject of the notification email.
     
    917917 * and subject line of the email sent to newly registered users.
    918918 *
    919  * @since MU
     919 * @since MU (3.0.0)
    920920 *
    921921 * @param string $user_login The user's login name.
     
    929929     * Filters whether to bypass the email notification for new user sign-up.
    930930     *
    931      * @since MU
     931     * @since MU (3.0.0)
    932932     *
    933933     * @param string $user_login User login name.
     
    954954         * Content should be formatted for transmission via wp_mail().
    955955         *
    956          * @since MU
     956         * @since MU (3.0.0)
    957957         *
    958958         * @param string $content    Content of the notification email.
     
    973973         * Filters the subject of the notification email of new user signup.
    974974         *
    975          * @since MU
     975         * @since MU (3.0.0)
    976976         *
    977977         * @param string $subject    Subject of the notification email.
     
    10061006 * by a Super Admin).
    10071007 *
    1008  * @since MU
     1008 * @since MU (3.0.0)
    10091009 *
    10101010 * @global wpdb $wpdb WordPress database abstraction object.
     
    10521052         * Fires immediately after a new user is activated.
    10531053         *
    1054          * @since MU
     1054         * @since MU (3.0.0)
    10551055         *
    10561056         * @param int   $user_id  User ID.
     
    10791079     * Fires immediately after a site is activated.
    10801080     *
    1081      * @since MU
     1081     * @since MU (3.0.0)
    10821082     *
    10831083     * @param int    $blog_id       Blog ID.
     
    11001100 * use {@see'user_register'}).
    11011101 *
    1102  * @since MU
     1102 * @since MU (3.0.0)
    11031103 *
    11041104 * @param string $user_name The new user's login name.
     
    11211121     * Fires immediately after a new user is created.
    11221122     *
    1123      * @since MU
     1123     * @since MU (3.0.0)
    11241124     *
    11251125     * @param int $user_id User ID.
     
    11421142 * root domain (eg 'blog1.example.com'), and $path is '/'.
    11431143 *
    1144  * @since MU
     1144 * @since MU (3.0.0)
    11451145 *
    11461146 * @param string $domain  The new site's domain.
     
    12071207     * Fires immediately after a new site is created.
    12081208     *
    1209      * @since MU
     1209     * @since MU (3.0.0)
    12101210     *
    12111211     * @param int    $blog_id Site ID.
     
    12291229 * the notification email.
    12301230 *
    1231  * @since MU
     1231 * @since MU (3.0.0)
    12321232 *
    12331233 * @param int    $blog_id    The new site's ID.
     
    12601260     * to the network administrator.
    12611261     *
    1262      * @since MU
     1262     * @since MU (3.0.0)
    12631263     *
    12641264     * @param string $msg Email body.
     
    12761276 * the notification email.
    12771277 *
    1278  * @since MU
     1278 * @since MU (3.0.0)
    12791279 *
    12801280 * @param int $user_id The new user's ID.
     
    13031303     * to the network administrator.
    13041304     *
    1305      * @since MU
     1305     * @since MU (3.0.0)
    13061306     *
    13071307     * @param string  $msg  Email body.
     
    13191319 * that each blogname is unique.
    13201320 *
    1321  * @since MU
     1321 * @since MU (3.0.0)
    13221322 *
    13231323 * @global wpdb $wpdb WordPress database abstraction object.
     
    13581358 * the new blog's ID. It is the first step in creating a new blog.
    13591359 *
    1360  * @since MU
     1360 * @since MU (3.0.0)
    13611361 *
    13621362 * @global wpdb $wpdb WordPress database abstraction object.
     
    13921392 * points to the new blog.
    13931393 *
    1394  * @since MU
     1394 * @since MU (3.0.0)
    13951395 *
    13961396 * @global wpdb     $wpdb
     
    14581458 * This function creates a row in the wp_blogs table.
    14591459 *
    1460  * @since MU
     1460 * @since MU (3.0.0)
    14611461 * @deprecated MU
    14621462 * @deprecated Use wp_install_defaults()
     
    14871487 * modify the content and subject line of the notification email.
    14881488 *
    1489  * @since MU
     1489 * @since MU (3.0.0)
    14901490 *
    14911491 * @param int    $blog_id  Blog ID.
     
    15041504     * Returning false disables the welcome email.
    15051505     *
    1506      * @since MU
     1506     * @since MU (3.0.0)
    15071507     *
    15081508     * @param int|bool $blog_id  Blog ID.
     
    15511551     * Content should be formatted for transmission via wp_mail().
    15521552     *
    1553      * @since MU
     1553     * @since MU (3.0.0)
    15541554     *
    15551555     * @param string $welcome_email Message body of the email.
     
    15791579     * Filters the subject of the welcome email after site activation.
    15801580     *
    1581      * @since MU
     1581     * @since MU (3.0.0)
    15821582     *
    15831583     * @param string $subject Subject of the email.
     
    16011601 * modify the content and subject line of the notification email.
    16021602 *
    1603  * @since MU
     1603 * @since MU (3.0.0)
    16041604 *
    16051605 * @param int    $user_id  User ID.
     
    16161616     * Returning false disables the welcome email.
    16171617     *
    1618      * @since MU
     1618     * @since MU (3.0.0)
    16191619     *
    16201620     * @param int    $user_id  User ID.
     
    16361636     * Content should be formatted for transmission via wp_mail().
    16371637     *
    1638      * @since MU
     1638     * @since MU (3.0.0)
    16391639     *
    16401640     * @param string $welcome_email The message body of the account activation success email.
     
    16671667     * Filters the subject of the welcome email after user activation.
    16681668     *
    1669      * @since MU
     1669     * @since MU (3.0.0)
    16701670     *
    16711671     * @param string $subject Subject of the email.
     
    16891689 * @see wpmu_current_site()
    16901690 *
    1691  * @since MU
     1691 * @since MU (3.0.0)
    16921692 *
    16931693 * @global WP_Network $current_site
     
    17061706 * the most recent post_date_gmt.
    17071707 *
    1708  * @since MU
     1708 * @since MU (3.0.0)
    17091709 *
    17101710 * @global wpdb $wpdb WordPress database abstraction object.
     
    17541754 * a blog has exceeded its allowed upload space.
    17551755 *
    1756  * @since MU
     1756 * @since MU (3.0.0)
    17571757 *
    17581758 * @param string $directory Full path of a directory.
     
    17851785 * other directories.
    17861786 *
    1787  * @since MU
     1787 * @since MU (3.0.0)
    17881788 * @since 4.3.0 $exclude parameter added.
    17891789 *
     
    18281828 * Super Admins at wp-admin/network/settings.php.
    18291829 *
    1830  * @since MU
     1830 * @since MU (3.0.0)
    18311831 *
    18321832 * @param array $mimes
     
    18531853 * or unpublished to make sure the count stays current.
    18541854 *
    1855  * @since MU
     1855 * @since MU (3.0.0)
    18561856 *
    18571857 * @global wpdb $wpdb WordPress database abstraction object.
     
    18671867 * Logs the user email, IP, and registration date of a new site.
    18681868 *
    1869  * @since MU
     1869 * @since MU (3.0.0)
    18701870 *
    18711871 * @global wpdb $wpdb WordPress database abstraction object.
     
    19591959 *
    19601960 * @see wp_validate_redirect()
    1961  * @since MU
     1961 * @since MU (3.0.0)
    19621962 *
    19631963 * @param array|string $deprecated Not used.
     
    19711971 * Check whether an upload is too big.
    19721972 *
    1973  * @since MU
     1973 * @since MU (3.0.0)
    19741974 *
    19751975 * @blessed
     
    19921992 * Add a nonce field to the signup page.
    19931993 *
    1994  * @since MU
     1994 * @since MU (3.0.0)
    19951995 */
    19961996function signup_nonce_fields() {
     
    20032003 * Process the signup nonce created in signup_nonce_fields().
    20042004 *
    2005  * @since MU
     2005 * @since MU (3.0.0)
    20062006 *
    20072007 * @param array $result
     
    20212021 * Correct 404 redirects when NOBLOGREDIRECT is defined.
    20222022 *
    2023  * @since MU
     2023 * @since MU (3.0.0)
    20242024 */
    20252025function maybe_redirect_404() {
     
    20482048 * added, as when a user is invited through the regular WP Add User interface.
    20492049 *
    2050  * @since MU
     2050 * @since MU (3.0.0)
    20512051 */
    20522052function maybe_add_existing_user_to_blog() {
     
    20732073 * Add a user to a blog based on details from maybe_add_existing_user_to_blog().
    20742074 *
    2075  * @since MU
     2075 * @since MU (3.0.0)
    20762076 *
    20772077 * @param array $details
     
    20852085         * Fires immediately after an existing user is added to a site.
    20862086         *
    2087          * @since MU
     2087         * @since MU (3.0.0)
    20882088         *
    20892089         * @param int   $user_id User ID.
     
    21012101 * is specifically hooked into the {@see 'wpmu_activate_user'} action.
    21022102 *
    2103  * @since MU
     2103 * @since MU (3.0.0)
    21042104 * @see add_user_to_blog()
    21052105 *
     
    21212121 * Correct From host on outgoing mail to match the site domain
    21222122 *
    2123  * @since MU
     2123 * @since MU (3.0.0)
    21242124 *
    21252125 * @param PHPMailer $phpmailer The PHPMailer instance, passed by reference.
     
    21322132 * Check to see whether a user is marked as a spammer, based on user login.
    21332133 *
    2134  * @since MU
     2134 * @since MU (3.0.0)
    21352135 *
    21362136 * @param string|WP_User $user Optional. Defaults to current user. WP_User object,
     
    21552155 * Public blogs have a setting of 1, private blogs are 0.
    21562156 *
    2157  * @since MU
     2157 * @since MU (3.0.0)
    21582158 *
    21592159 * @param int $old_value
     
    21672167 * Check whether a usermeta key has to do with the current blog.
    21682168 *
    2169  * @since MU
     2169 * @since MU (3.0.0)
    21702170 *
    21712171 * @global wpdb $wpdb WordPress database abstraction object.
     
    21912191 * Check whether users can self-register, based on Network settings.
    21922192 *
    2193  * @since MU
     2193 * @since MU (3.0.0)
    21942194 *
    21952195 * @return bool
     
    22032203 * Ensure that the welcome message is not empty. Currently unused.
    22042204 *
    2205  * @since MU
     2205 * @since MU (3.0.0)
    22062206 *
    22072207 * @param string $text
     
    24182418 * Returns the upload quota for the current blog.
    24192419 *
    2420  * @since MU
     2420 * @since MU (3.0.0)
    24212421 *
    24222422 * @return int Quota in megabytes
  • trunk/src/wp-includes/user.php

    r41186 r41200  
    424424 * Get the current user's ID
    425425 *
    426  * @since MU
     426 * @since MU (3.0.0)
    427427 *
    428428 * @return int The current user's ID, or 0 if no user is logged in.
     
    680680     * Filters the list of sites a user belongs to.
    681681     *
    682      * @since MU
     682     * @since MU (3.0.0)
    683683     *
    684684     * @param array $sites   An array of site objects belonging to the user.
     
    693693 * Find out whether a user is a member of a given blog.
    694694 *
    695  * @since MU 1.1
     695 * @since MU (3.0.0) 1.1
    696696 *
    697697 * @global wpdb $wpdb WordPress database abstraction object.
     
    26702670         * ###SITEURL###   The URL to the site.
    26712671         *
    2672          * @since MU
     2672         * @since MU (3.0.0)
    26732673         * @since 4.9.0 This filter is no longer Multisite specific.
    26742674         *
  • trunk/src/wp-signup.php

    r39944 r41200  
    1616 * Prints signup_header via wp_head
    1717 *
    18  * @since MU
     18 * @since MU (3.0.0)
    1919 */
    2020function do_signup_header() {
     
    5151 * Prints styles for front-end Multisite signup pages
    5252 *
    53  * @since MU
     53 * @since MU (3.0.0)
    5454 */
    5555function wpmu_signup_stylesheet() {
     
    9090 * Generates and displays the Signup and Create Site forms
    9191 *
    92  * @since MU
     92 * @since MU (3.0.0)
    9393 *
    9494 * @param string          $blogname   The new site name.
     
    199199 * Validate the new site signup
    200200 *
    201  * @since MU
     201 * @since MU (3.0.0)
    202202 *
    203203 * @return array Contains the new site data and error messages.
     
    214214 * Display user registration form
    215215 *
    216  * @since MU
     216 * @since MU (3.0.0)
    217217 *
    218218 * @param string          $user_name  The entered username.
     
    256256 * Validate user signup name and email
    257257 *
    258  * @since MU
     258 * @since MU (3.0.0)
    259259 *
    260260 * @return array Contains username, email, and error messages.
     
    267267 * Allow returning users to sign up for another site
    268268 *
    269  * @since MU
     269 * @since MU (3.0.0)
    270270 *
    271271 * @param string          $blogname   The new site name
     
    333333         * Hidden sign-up form fields output when creating another site or user.
    334334         *
    335          * @since MU
     335         * @since MU (3.0.0)
    336336         *
    337337         * @param string $context A string describing the steps of the sign-up process. The value can be
     
    349349 * Validate a new site signup.
    350350 *
    351  * @since MU
     351 * @since MU (3.0.0)
    352352 *
    353353 * @return null|bool True if site signup was validated, false if error.
     
    402402     * Use the {@see 'add_signup_meta'} filter instead.
    403403     *
    404      * @since MU
     404     * @since MU (3.0.0)
    405405     * @deprecated 3.0.0 Use the {@see 'add_signup_meta'} filter instead.
    406406     *
     
    436436 * Confirm a new site signup.
    437437 *
    438  * @since MU
     438 * @since MU (3.0.0)
    439439 * @since 4.4.0 Added the `$blog_id` parameter.
    440440 *
     
    491491 * Setup the new user signup process
    492492 *
    493  * @since MU
     493 * @since MU (3.0.0)
    494494 *
    495495 * @param string          $user_name  The username.
     
    565565 * Validate the new user signup
    566566 *
    567  * @since MU
     567 * @since MU (3.0.0)
    568568 *
    569569 * @return bool True if new user signup was validated, false if error
     
    595595 * New user signup confirmation
    596596 *
    597  * @since MU
     597 * @since MU (3.0.0)
    598598 *
    599599 * @param string $user_name The username
     
    616616 * Setup the new site signup
    617617 *
    618  * @since MU
     618 * @since MU (3.0.0)
    619619 *
    620620 * @param string          $user_name  The username.
     
    679679 * Validate new site signup
    680680 *
    681  * @since MU
     681 * @since MU (3.0.0)
    682682 *
    683683 * @return bool True if the site signup was validated, false if error
     
    736736 * New site signup confirmation
    737737 *
    738  * @since MU
     738 * @since MU (3.0.0)
    739739 *
    740740 * @param string $domain The domain URL
Note: See TracChangeset for help on using the changeset viewer.