Changeset 41200
- Timestamp:
- 08/01/2017 08:43:25 PM (8 years ago)
- Location:
- trunk/src
- Files:
-
- 17 edited
-
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)
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/wp-activate.php
r38664 r41200 37 37 * Fires on {@see 'wp_head'}. 38 38 * 39 * @since MU 39 * @since MU (3.0.0) 40 40 */ 41 41 function do_activate_header() { … … 54 54 * Loads styles specific to this page. 55 55 * 56 * @since MU 56 * @since MU (3.0.0) 57 57 */ 58 58 function wpmu_activate_stylesheet() { -
trunk/src/wp-admin/includes/class-wp-ms-sites-list-table.php
r41161 r41200 237 237 * Filters the displayed site columns in Sites list table. 238 238 * 239 * @since MU 239 * @since MU (3.0.0) 240 240 * 241 241 * @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. 422 422 * 423 * @since MU 423 * @since MU (3.0.0) 424 424 * 425 425 * @param int $blog_id The site ID. -
trunk/src/wp-admin/includes/class-wp-ms-users-list-table.php
r41161 r41200 175 175 * Filters the columns displayed in the Network Admin Users list table. 176 176 * 177 * @since MU 177 * @since MU (3.0.0) 178 178 * 179 179 * @param array $users_columns An array of user columns. Default 'cb', 'username', -
trunk/src/wp-admin/includes/dashboard.php
r40948 r41200 420 420 * just before the user and site search form fields. 421 421 * 422 * @since MU 422 * @since MU (3.0.0) 423 423 * 424 424 * @param null $unused … … 446 446 * Fires at the end of the 'Right Now' widget in the Network Admin dashboard. 447 447 * 448 * @since MU 448 * @since MU (3.0.0) 449 449 */ 450 450 do_action( 'mu_rightnow_end' ); … … 453 453 * Fires at the end of the 'Right Now' widget in the Network Admin dashboard. 454 454 * 455 * @since MU 455 * @since MU (3.0.0) 456 456 */ 457 457 do_action( 'mu_activity_box_end' ); -
trunk/src/wp-admin/includes/ms.php
r41163 r41200 73 73 * Fires before a site is deleted. 74 74 * 75 * @since MU 75 * @since MU (3.0.0) 76 76 * 77 77 * @param int $blog_id The site ID. … … 117 117 * Filters the tables to drop when the site is deleted. 118 118 * 119 * @since MU 119 * @since MU (3.0.0) 120 120 * 121 121 * @param array $tables The site tables to be dropped. … … 133 133 * Filters the upload base directory to delete when the site is deleted. 134 134 * 135 * @since MU 135 * @since MU (3.0.0) 136 136 * 137 137 * @param string $uploads['basedir'] Uploads path without subdirectory. @see wp_upload_dir() … … 222 222 * Fires before a user is deleted from the network. 223 223 * 224 * @since MU 224 * @since MU (3.0.0) 225 225 * 226 226 * @param int $id ID of the user about to be deleted from the network. … … 315 315 * ###SITEURL### The URL to the site. 316 316 * 317 * @since MU 317 * @since MU (3.0.0) 318 318 * 319 319 * @param string $email_text Text in the email. … … 339 339 * Check whether a site has used its allotted upload space. 340 340 * 341 * @since MU 341 * @since MU (3.0.0) 342 342 * 343 343 * @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. 367 367 * 368 * @since MU 368 * @since MU (3.0.0) 369 369 */ 370 370 function display_space_usage() { … … 394 394 * Get the remaining upload space for this site. 395 395 * 396 * @since MU 396 * @since MU (3.0.0) 397 397 * 398 398 * @param int $size Current max size in bytes … … 531 531 * Filters the language codes. 532 532 * 533 * @since MU 533 * @since MU (3.0.0) 534 534 * 535 535 * @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. 660 660 * 661 * @since MU 661 * @since MU (3.0.0) 662 662 * 663 663 * @param array $output HTML output of the dropdown. -
trunk/src/wp-admin/menu-header.php
r39141 r41200 32 32 * Allows plugins to move sub-menu items around. 33 33 * 34 * @since MU 34 * @since MU (3.0.0) 35 35 * 36 36 * @param string $parent_file The parent file. -
trunk/src/wp-admin/my-sites.php
r39551 r41200 96 96 * to be added, either globally or for specific sites. 97 97 * 98 * @since MU 98 * @since MU (3.0.0) 99 99 * 100 100 * @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. 115 115 * 116 * @since MU 116 * @since MU (3.0.0) 117 117 * 118 118 * @param string $string The HTML site link markup. -
trunk/src/wp-admin/network/settings.php
r40953 r41200 81 81 * Fires after the network options are updated. 82 82 * 83 * @since MU 83 * @since MU (3.0.0) 84 84 */ 85 85 do_action( 'update_wpmu_options' ); … … 371 371 * screen in their individual sites' dashboards. 372 372 * 373 * @since MU 373 * @since MU (3.0.0) 374 374 * 375 375 * @param array $admin_menus The menu items available. … … 394 394 * Fires at the end of the Network Settings form, before the submit button. 395 395 * 396 * @since MU 396 * @since MU (3.0.0) 397 397 */ 398 398 do_action( 'wpmu_options' ); ?> -
trunk/src/wp-admin/network/sites.php
r41131 r41200 230 230 * Fires after a network site is activated. 231 231 * 232 * @since MU 232 * @since MU (3.0.0) 233 233 * 234 234 * @param string $id The ID of the activated site. … … 241 241 * Fires before a network site is deactivated. 242 242 * 243 * @since MU 243 * @since MU (3.0.0) 244 244 * 245 245 * @param string $id The ID of the site being deactivated. -
trunk/src/wp-admin/network/upgrade.php
r40404 r41200 95 95 * Fires after the Multisite DB upgrade for each site is complete. 96 96 * 97 * @since MU 97 * @since MU (3.0.0) 98 98 * 99 99 * @param array|WP_Error $response The upgrade response array or WP_Error on failure. … … 103 103 * Fires after each site has been upgraded. 104 104 * 105 * @since MU 105 * @since MU (3.0.0) 106 106 * 107 107 * @param int $site_id The Site ID. … … 134 134 * Fires before the footer on the network upgrade screen. 135 135 * 136 * @since MU 136 * @since MU (3.0.0) 137 137 */ 138 138 do_action( 'wpmu_upgrade_page' ); -
trunk/src/wp-includes/class-wp-theme.php
r41162 r41200 1271 1271 * Filters the array of themes allowed on the network. 1272 1272 * 1273 * @since MU 1273 * @since MU (3.0.0) 1274 1274 * 1275 1275 * @param array $allowed_themes An array of theme stylesheet names. -
trunk/src/wp-includes/deprecated.php
r40949 r41200 2799 2799 * Checks if the current user belong to a given site. 2800 2800 * 2801 * @since MU 2801 * @since MU (3.0.0) 2802 2802 * @deprecated 3.3.0 Use is_user_member_of_blog() 2803 2803 * @see is_user_member_of_blog() -
trunk/src/wp-includes/ms-blogs.php
r40352 r41200 6 6 * @package WordPress 7 7 * @subpackage Multisite 8 * @since MU 8 * @since MU (3.0.0) 9 9 */ 10 10 … … 12 12 * Update the last_updated field for the current site. 13 13 * 14 * @since MU 14 * @since MU (3.0.0) 15 15 * 16 16 * @global wpdb $wpdb WordPress database abstraction object. … … 23 23 * Fires after the blog details are updated. 24 24 * 25 * @since MU 25 * @since MU (3.0.0) 26 26 * 27 27 * @param int $blog_id Site ID. … … 33 33 * Get a full blog URL, given a blog id. 34 34 * 35 * @since MU 35 * @since MU (3.0.0) 36 36 * 37 37 * @param int $blog_id Blog ID … … 54 54 * Get a full blog URL, given a blog name. 55 55 * 56 * @since MU 56 * @since MU (3.0.0) 57 57 * 58 58 * @param string $blogname The (subdomain or directory) name … … 75 75 * Retrieves a sites ID given its (subdomain or directory) slug. 76 76 * 77 * @since MU 77 * @since MU (3.0.0) 78 78 * @since 4.7.0 Converted to use get_sites(). 79 79 * … … 110 110 * Retrieve the details for a blog from the blogs table and blog options. 111 111 * 112 * @since MU 112 * @since MU (3.0.0) 113 113 * 114 114 * @global wpdb $wpdb WordPress database abstraction object. … … 240 240 * Filters a blog's details. 241 241 * 242 * @since MU 242 * @since MU (3.0.0) 243 243 * @deprecated 4.7.0 Use site_details 244 244 * … … 258 258 * Clear the blog details cache. 259 259 * 260 * @since MU 260 * @since MU (3.0.0) 261 261 * 262 262 * @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. 296 296 * 297 * @since MU 297 * @since MU (3.0.0) 298 298 * 299 299 * @global wpdb $wpdb WordPress database abstraction object. … … 342 342 * Fires when the 'spam' status is added to a blog. 343 343 * 344 * @since MU 344 * @since MU (3.0.0) 345 345 * 346 346 * @param int $blog_id Blog ID. … … 351 351 * Fires when the 'spam' status is removed from a blog. 352 352 * 353 * @since MU 353 * @since MU (3.0.0) 354 354 * 355 355 * @param int $blog_id Blog ID. … … 388 388 * Fires when the 'archived' status is added to a blog. 389 389 * 390 * @since MU 390 * @since MU (3.0.0) 391 391 * 392 392 * @param int $blog_id Blog ID. … … 397 397 * Fires when the 'archived' status is removed from a blog. 398 398 * 399 * @since MU 399 * @since MU (3.0.0) 400 400 * 401 401 * @param int $blog_id Blog ID. … … 649 649 * If the option was serialized then it will be unserialized when it is returned. 650 650 * 651 * @since MU 651 * @since MU (3.0.0) 652 652 * 653 653 * @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. 695 695 * 696 * @since MU 696 * @since MU (3.0.0) 697 697 * 698 698 * @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. 721 721 * 722 * @since MU 722 * @since MU (3.0.0) 723 723 * 724 724 * @param int $id A blog ID. Can be null to refer to the current blog. … … 745 745 * Update an option for a particular blog. 746 746 * 747 * @since MU 747 * @since MU (3.0.0) 748 748 * 749 749 * @param int $id The blog id. … … 780 780 * 781 781 * @see restore_current_blog() 782 * @since MU 782 * @since MU (3.0.0) 783 783 * 784 784 * @global wpdb $wpdb … … 812 812 * Fires when the blog is switched. 813 813 * 814 * @since MU 814 * @since MU (3.0.0) 815 815 * 816 816 * @param int $new_blog New blog ID. … … 866 866 * 867 867 * @see switch_to_blog() 868 * @since MU 868 * @since MU (3.0.0) 869 869 * 870 870 * @global wpdb $wpdb … … 954 954 * Check if a particular blog is archived. 955 955 * 956 * @since MU 956 * @since MU (3.0.0) 957 957 * 958 958 * @param int $id The blog id … … 966 966 * Update the 'archived' status of a particular blog. 967 967 * 968 * @since MU 968 * @since MU (3.0.0) 969 969 * 970 970 * @param int $id The blog id … … 980 980 * Update a blog details field. 981 981 * 982 * @since MU 982 * @since MU (3.0.0) 983 983 * 984 984 * @global wpdb $wpdb WordPress database abstraction object. … … 1042 1042 * Fires after the current blog's 'public' setting is updated. 1043 1043 * 1044 * @since MU 1044 * @since MU (3.0.0) 1045 1045 * 1046 1046 * @param int $blog_id Blog ID. … … 1056 1056 * Get a blog details field. 1057 1057 * 1058 * @since MU 1058 * @since MU (3.0.0) 1059 1059 * 1060 1060 * @global wpdb $wpdb WordPress database abstraction object. … … 1077 1077 * Get a list of most recently updated blogs. 1078 1078 * 1079 * @since MU 1079 * @since MU (3.0.0) 1080 1080 * 1081 1081 * @global wpdb $wpdb WordPress database abstraction object. -
trunk/src/wp-includes/ms-deprecated.php
r40929 r41200 18 18 * Dashboard blog functionality was removed in WordPress 3.1, replaced by the user admin. 19 19 * 20 * @since MU 20 * @since MU (3.0.0) 21 21 * @deprecated 3.1.0 Use get_site() 22 22 * @see get_site() … … 36 36 * Generates a random password. 37 37 * 38 * @since MU 38 * @since MU (3.0.0) 39 39 * @deprecated 3.0.0 Use wp_generate_password() 40 40 * @see wp_generate_password() … … 56 56 * legacy function_exists() checks to determine if multisite is enabled. 57 57 * 58 * @since MU 58 * @since MU (3.0.0) 59 59 * @deprecated 3.0.0 Use is_super_admin() 60 60 * @see is_super_admin() … … 83 83 * Deprecated functionality to gracefully fail. 84 84 * 85 * @since MU 85 * @since MU (3.0.0) 86 86 * @deprecated 3.0.0 Use wp_die() 87 87 * @see wp_die() … … 121 121 * Deprecated functionality to retrieve user information. 122 122 * 123 * @since MU 123 * @since MU (3.0.0) 124 124 * @deprecated 3.0.0 Use get_user_by() 125 125 * @see get_user_by() … … 135 135 * Deprecated functionality to clear the global post cache. 136 136 * 137 * @since MU 137 * @since MU (3.0.0) 138 138 * @deprecated 3.0.0 Use clean_post_cache() 139 139 * @see clean_post_cache() … … 148 148 * Deprecated functionality to determin if the current site is the main site. 149 149 * 150 * @since MU 150 * @since MU (3.0.0) 151 151 * @deprecated 3.0.0 Use is_main_site() 152 152 * @see is_main_site() … … 160 160 * Deprecated functionality to validate an email address. 161 161 * 162 * @since MU 162 * @since MU (3.0.0) 163 163 * @deprecated 3.0.0 Use is_email() 164 164 * @see is_email() … … 176 176 * Deprecated functionality to retrieve a list of all sites. 177 177 * 178 * @since MU 178 * @since MU (3.0.0) 179 179 * @deprecated 3.0.0 Use wp_get_sites() 180 180 * @see wp_get_sites() … … 210 210 * Deprecated functionality to retrieve a list of the most active sites. 211 211 * 212 * @since MU 212 * @since MU (3.0.0) 213 213 * @deprecated 3.0.0 214 214 * … … 262 262 * 6) $url 263 263 * 264 * @since MU 264 * @since MU (3.0.0) 265 265 * @deprecated 3.3.0 Use wp_redirect() 266 266 * @see wp_redirect() … … 301 301 * Adds an 'updated=true' argument to a URL. 302 302 * 303 * @since MU 303 * @since MU (3.0.0) 304 304 * @deprecated 3.3.0 Use add_query_arg() 305 305 * @see add_query_arg() … … 326 326 * and is simply returned as such. 327 327 * 328 * @since MU 328 * @since MU (3.0.0) 329 329 * @deprecated 3.6.0 Use get_user_by() 330 330 * @see get_user_by() … … 351 351 * Get a full blog URL, given a domain and a path. 352 352 * 353 * @since MU 353 * @since MU (3.0.0) 354 354 * @deprecated 3.7.0 355 355 * … … 380 380 * Create an empty blog. 381 381 * 382 * @since MU 1.0382 * @since MU (3.0.0) 1.0 383 383 * @deprecated 4.4.0 384 384 * … … 416 416 * Get the admin for a domain/path combination. 417 417 * 418 * @since MU 1.0418 * @since MU (3.0.0) 1.0 419 419 * @deprecated 4.4.0 420 420 * -
trunk/src/wp-includes/ms-functions.php
r41164 r41200 11 11 * Gets the network's site and user counts. 12 12 * 13 * @since MU 1.013 * @since MU (3.0.0) 1.0 14 14 * 15 15 * @return array Site and user count for the network. … … 33 33 * is returned. 34 34 * 35 * @since MU 1.035 * @since MU (3.0.0) 1.0 36 36 * 37 37 * @global wpdb $wpdb WordPress database abstraction object. … … 96 96 * The count is cached and updated twice daily. This is not a live count. 97 97 * 98 * @since MU 2.798 * @since MU (3.0.0) 2.7 99 99 * @since 4.8.0 The $network_id parameter has been added. 100 100 * … … 111 111 * The count is cached and updated twice daily. This is not a live count. 112 112 * 113 * @since MU 1.0113 * @since MU (3.0.0) 1.0 114 114 * @since 3.7.0 The $network_id parameter has been deprecated. 115 115 * @since 4.8.0 The $network_id parameter is now being used. … … 125 125 * Get a blog post from any site on the network. 126 126 * 127 * @since MU 1.0127 * @since MU (3.0.0) 1.0 128 128 * 129 129 * @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. 145 145 * 146 * @since MU 1.0146 * @since MU (3.0.0) 1.0 147 147 * 148 148 * @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. 173 173 * 174 * @since MU 174 * @since MU (3.0.0) 175 175 * 176 176 * @param int $user_id User ID. … … 194 194 * reassign the user's blog posts to another user upon removal. 195 195 * 196 * @since MU 1.0196 * @since MU (3.0.0) 1.0 197 197 * 198 198 * @global wpdb $wpdb WordPress database abstraction object. … … 210 210 * Fires before a user is removed from a site. 211 211 * 212 * @since MU 212 * @since MU (3.0.0) 213 213 * 214 214 * @param int $user_id User ID. … … 275 275 * Get the permalink for a post on another blog. 276 276 * 277 * @since MU 1.0277 * @since MU (3.0.0) 1.0 278 278 * 279 279 * @param int $blog_id ID of the source blog. … … 297 297 * $domain is 'blog1.example.com' and $path is '/'. 298 298 * 299 * @since MU 2.6.5299 * @since MU (3.0.0) 2.6.5 300 300 * 301 301 * @global wpdb $wpdb WordPress database abstraction object. … … 343 343 * bypasses this check. 344 344 * 345 * @since MU 345 * @since MU (3.0.0) 346 346 * 347 347 * @param string $user_email The email provided by the user at registration. … … 401 401 * necessary. 402 402 * 403 * @since MU 403 * @since MU (3.0.0) 404 404 * 405 405 * @global wpdb $wpdb WordPress database abstraction object. … … 507 507 * registration. The values are solely used for validation and error handling. 508 508 * 509 * @since MU 509 * @since MU (3.0.0) 510 510 * 511 511 * @param array $result { … … 535 535 * the way that WordPress validates new site signups. 536 536 * 537 * @since MU 537 * @since MU (3.0.0) 538 538 * 539 539 * @global wpdb $wpdb … … 606 606 * path depending on the network settings. 607 607 * 608 * @since MU 608 * @since MU (3.0.0) 609 609 * 610 610 * @param string $blogname Site name. … … 649 649 * Filters site details and error messages following registration. 650 650 * 651 * @since MU 651 * @since MU (3.0.0) 652 652 * 653 653 * @param array $result { … … 668 668 * Record site signup information for future activation. 669 669 * 670 * @since MU 670 * @since MU (3.0.0) 671 671 * 672 672 * @global wpdb $wpdb WordPress database abstraction object. … … 734 734 * new site registration is not. 735 735 * 736 * @since MU 736 * @since MU (3.0.0) 737 737 * 738 738 * @global wpdb $wpdb WordPress database abstraction object. … … 801 801 * and subject line of the email sent to newly registered users. 802 802 * 803 * @since MU 803 * @since MU (3.0.0) 804 804 * 805 805 * @param string $domain The new blog domain. … … 816 816 * Filters whether to bypass the new site email notification. 817 817 * 818 * @since MU 818 * @since MU (3.0.0) 819 819 * 820 820 * @param string|bool $domain Site domain. … … 852 852 * Content should be formatted for transmission via wp_mail(). 853 853 * 854 * @since MU 854 * @since MU (3.0.0) 855 855 * 856 856 * @param string $content Content of the notification email. … … 876 876 * Filters the subject of the new blog notification email. 877 877 * 878 * @since MU 878 * @since MU (3.0.0) 879 879 * 880 880 * @param string $subject Subject of the notification email. … … 917 917 * and subject line of the email sent to newly registered users. 918 918 * 919 * @since MU 919 * @since MU (3.0.0) 920 920 * 921 921 * @param string $user_login The user's login name. … … 929 929 * Filters whether to bypass the email notification for new user sign-up. 930 930 * 931 * @since MU 931 * @since MU (3.0.0) 932 932 * 933 933 * @param string $user_login User login name. … … 954 954 * Content should be formatted for transmission via wp_mail(). 955 955 * 956 * @since MU 956 * @since MU (3.0.0) 957 957 * 958 958 * @param string $content Content of the notification email. … … 973 973 * Filters the subject of the notification email of new user signup. 974 974 * 975 * @since MU 975 * @since MU (3.0.0) 976 976 * 977 977 * @param string $subject Subject of the notification email. … … 1006 1006 * by a Super Admin). 1007 1007 * 1008 * @since MU 1008 * @since MU (3.0.0) 1009 1009 * 1010 1010 * @global wpdb $wpdb WordPress database abstraction object. … … 1052 1052 * Fires immediately after a new user is activated. 1053 1053 * 1054 * @since MU 1054 * @since MU (3.0.0) 1055 1055 * 1056 1056 * @param int $user_id User ID. … … 1079 1079 * Fires immediately after a site is activated. 1080 1080 * 1081 * @since MU 1081 * @since MU (3.0.0) 1082 1082 * 1083 1083 * @param int $blog_id Blog ID. … … 1100 1100 * use {@see'user_register'}). 1101 1101 * 1102 * @since MU 1102 * @since MU (3.0.0) 1103 1103 * 1104 1104 * @param string $user_name The new user's login name. … … 1121 1121 * Fires immediately after a new user is created. 1122 1122 * 1123 * @since MU 1123 * @since MU (3.0.0) 1124 1124 * 1125 1125 * @param int $user_id User ID. … … 1142 1142 * root domain (eg 'blog1.example.com'), and $path is '/'. 1143 1143 * 1144 * @since MU 1144 * @since MU (3.0.0) 1145 1145 * 1146 1146 * @param string $domain The new site's domain. … … 1207 1207 * Fires immediately after a new site is created. 1208 1208 * 1209 * @since MU 1209 * @since MU (3.0.0) 1210 1210 * 1211 1211 * @param int $blog_id Site ID. … … 1229 1229 * the notification email. 1230 1230 * 1231 * @since MU 1231 * @since MU (3.0.0) 1232 1232 * 1233 1233 * @param int $blog_id The new site's ID. … … 1260 1260 * to the network administrator. 1261 1261 * 1262 * @since MU 1262 * @since MU (3.0.0) 1263 1263 * 1264 1264 * @param string $msg Email body. … … 1276 1276 * the notification email. 1277 1277 * 1278 * @since MU 1278 * @since MU (3.0.0) 1279 1279 * 1280 1280 * @param int $user_id The new user's ID. … … 1303 1303 * to the network administrator. 1304 1304 * 1305 * @since MU 1305 * @since MU (3.0.0) 1306 1306 * 1307 1307 * @param string $msg Email body. … … 1319 1319 * that each blogname is unique. 1320 1320 * 1321 * @since MU 1321 * @since MU (3.0.0) 1322 1322 * 1323 1323 * @global wpdb $wpdb WordPress database abstraction object. … … 1358 1358 * the new blog's ID. It is the first step in creating a new blog. 1359 1359 * 1360 * @since MU 1360 * @since MU (3.0.0) 1361 1361 * 1362 1362 * @global wpdb $wpdb WordPress database abstraction object. … … 1392 1392 * points to the new blog. 1393 1393 * 1394 * @since MU 1394 * @since MU (3.0.0) 1395 1395 * 1396 1396 * @global wpdb $wpdb … … 1458 1458 * This function creates a row in the wp_blogs table. 1459 1459 * 1460 * @since MU 1460 * @since MU (3.0.0) 1461 1461 * @deprecated MU 1462 1462 * @deprecated Use wp_install_defaults() … … 1487 1487 * modify the content and subject line of the notification email. 1488 1488 * 1489 * @since MU 1489 * @since MU (3.0.0) 1490 1490 * 1491 1491 * @param int $blog_id Blog ID. … … 1504 1504 * Returning false disables the welcome email. 1505 1505 * 1506 * @since MU 1506 * @since MU (3.0.0) 1507 1507 * 1508 1508 * @param int|bool $blog_id Blog ID. … … 1551 1551 * Content should be formatted for transmission via wp_mail(). 1552 1552 * 1553 * @since MU 1553 * @since MU (3.0.0) 1554 1554 * 1555 1555 * @param string $welcome_email Message body of the email. … … 1579 1579 * Filters the subject of the welcome email after site activation. 1580 1580 * 1581 * @since MU 1581 * @since MU (3.0.0) 1582 1582 * 1583 1583 * @param string $subject Subject of the email. … … 1601 1601 * modify the content and subject line of the notification email. 1602 1602 * 1603 * @since MU 1603 * @since MU (3.0.0) 1604 1604 * 1605 1605 * @param int $user_id User ID. … … 1616 1616 * Returning false disables the welcome email. 1617 1617 * 1618 * @since MU 1618 * @since MU (3.0.0) 1619 1619 * 1620 1620 * @param int $user_id User ID. … … 1636 1636 * Content should be formatted for transmission via wp_mail(). 1637 1637 * 1638 * @since MU 1638 * @since MU (3.0.0) 1639 1639 * 1640 1640 * @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. 1668 1668 * 1669 * @since MU 1669 * @since MU (3.0.0) 1670 1670 * 1671 1671 * @param string $subject Subject of the email. … … 1689 1689 * @see wpmu_current_site() 1690 1690 * 1691 * @since MU 1691 * @since MU (3.0.0) 1692 1692 * 1693 1693 * @global WP_Network $current_site … … 1706 1706 * the most recent post_date_gmt. 1707 1707 * 1708 * @since MU 1708 * @since MU (3.0.0) 1709 1709 * 1710 1710 * @global wpdb $wpdb WordPress database abstraction object. … … 1754 1754 * a blog has exceeded its allowed upload space. 1755 1755 * 1756 * @since MU 1756 * @since MU (3.0.0) 1757 1757 * 1758 1758 * @param string $directory Full path of a directory. … … 1785 1785 * other directories. 1786 1786 * 1787 * @since MU 1787 * @since MU (3.0.0) 1788 1788 * @since 4.3.0 $exclude parameter added. 1789 1789 * … … 1828 1828 * Super Admins at wp-admin/network/settings.php. 1829 1829 * 1830 * @since MU 1830 * @since MU (3.0.0) 1831 1831 * 1832 1832 * @param array $mimes … … 1853 1853 * or unpublished to make sure the count stays current. 1854 1854 * 1855 * @since MU 1855 * @since MU (3.0.0) 1856 1856 * 1857 1857 * @global wpdb $wpdb WordPress database abstraction object. … … 1867 1867 * Logs the user email, IP, and registration date of a new site. 1868 1868 * 1869 * @since MU 1869 * @since MU (3.0.0) 1870 1870 * 1871 1871 * @global wpdb $wpdb WordPress database abstraction object. … … 1959 1959 * 1960 1960 * @see wp_validate_redirect() 1961 * @since MU 1961 * @since MU (3.0.0) 1962 1962 * 1963 1963 * @param array|string $deprecated Not used. … … 1971 1971 * Check whether an upload is too big. 1972 1972 * 1973 * @since MU 1973 * @since MU (3.0.0) 1974 1974 * 1975 1975 * @blessed … … 1992 1992 * Add a nonce field to the signup page. 1993 1993 * 1994 * @since MU 1994 * @since MU (3.0.0) 1995 1995 */ 1996 1996 function signup_nonce_fields() { … … 2003 2003 * Process the signup nonce created in signup_nonce_fields(). 2004 2004 * 2005 * @since MU 2005 * @since MU (3.0.0) 2006 2006 * 2007 2007 * @param array $result … … 2021 2021 * Correct 404 redirects when NOBLOGREDIRECT is defined. 2022 2022 * 2023 * @since MU 2023 * @since MU (3.0.0) 2024 2024 */ 2025 2025 function maybe_redirect_404() { … … 2048 2048 * added, as when a user is invited through the regular WP Add User interface. 2049 2049 * 2050 * @since MU 2050 * @since MU (3.0.0) 2051 2051 */ 2052 2052 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(). 2074 2074 * 2075 * @since MU 2075 * @since MU (3.0.0) 2076 2076 * 2077 2077 * @param array $details … … 2085 2085 * Fires immediately after an existing user is added to a site. 2086 2086 * 2087 * @since MU 2087 * @since MU (3.0.0) 2088 2088 * 2089 2089 * @param int $user_id User ID. … … 2101 2101 * is specifically hooked into the {@see 'wpmu_activate_user'} action. 2102 2102 * 2103 * @since MU 2103 * @since MU (3.0.0) 2104 2104 * @see add_user_to_blog() 2105 2105 * … … 2121 2121 * Correct From host on outgoing mail to match the site domain 2122 2122 * 2123 * @since MU 2123 * @since MU (3.0.0) 2124 2124 * 2125 2125 * @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. 2133 2133 * 2134 * @since MU 2134 * @since MU (3.0.0) 2135 2135 * 2136 2136 * @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. 2156 2156 * 2157 * @since MU 2157 * @since MU (3.0.0) 2158 2158 * 2159 2159 * @param int $old_value … … 2167 2167 * Check whether a usermeta key has to do with the current blog. 2168 2168 * 2169 * @since MU 2169 * @since MU (3.0.0) 2170 2170 * 2171 2171 * @global wpdb $wpdb WordPress database abstraction object. … … 2191 2191 * Check whether users can self-register, based on Network settings. 2192 2192 * 2193 * @since MU 2193 * @since MU (3.0.0) 2194 2194 * 2195 2195 * @return bool … … 2203 2203 * Ensure that the welcome message is not empty. Currently unused. 2204 2204 * 2205 * @since MU 2205 * @since MU (3.0.0) 2206 2206 * 2207 2207 * @param string $text … … 2418 2418 * Returns the upload quota for the current blog. 2419 2419 * 2420 * @since MU 2420 * @since MU (3.0.0) 2421 2421 * 2422 2422 * @return int Quota in megabytes -
trunk/src/wp-includes/user.php
r41186 r41200 424 424 * Get the current user's ID 425 425 * 426 * @since MU 426 * @since MU (3.0.0) 427 427 * 428 428 * @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. 681 681 * 682 * @since MU 682 * @since MU (3.0.0) 683 683 * 684 684 * @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. 694 694 * 695 * @since MU 1.1695 * @since MU (3.0.0) 1.1 696 696 * 697 697 * @global wpdb $wpdb WordPress database abstraction object. … … 2670 2670 * ###SITEURL### The URL to the site. 2671 2671 * 2672 * @since MU 2672 * @since MU (3.0.0) 2673 2673 * @since 4.9.0 This filter is no longer Multisite specific. 2674 2674 * -
trunk/src/wp-signup.php
r39944 r41200 16 16 * Prints signup_header via wp_head 17 17 * 18 * @since MU 18 * @since MU (3.0.0) 19 19 */ 20 20 function do_signup_header() { … … 51 51 * Prints styles for front-end Multisite signup pages 52 52 * 53 * @since MU 53 * @since MU (3.0.0) 54 54 */ 55 55 function wpmu_signup_stylesheet() { … … 90 90 * Generates and displays the Signup and Create Site forms 91 91 * 92 * @since MU 92 * @since MU (3.0.0) 93 93 * 94 94 * @param string $blogname The new site name. … … 199 199 * Validate the new site signup 200 200 * 201 * @since MU 201 * @since MU (3.0.0) 202 202 * 203 203 * @return array Contains the new site data and error messages. … … 214 214 * Display user registration form 215 215 * 216 * @since MU 216 * @since MU (3.0.0) 217 217 * 218 218 * @param string $user_name The entered username. … … 256 256 * Validate user signup name and email 257 257 * 258 * @since MU 258 * @since MU (3.0.0) 259 259 * 260 260 * @return array Contains username, email, and error messages. … … 267 267 * Allow returning users to sign up for another site 268 268 * 269 * @since MU 269 * @since MU (3.0.0) 270 270 * 271 271 * @param string $blogname The new site name … … 333 333 * Hidden sign-up form fields output when creating another site or user. 334 334 * 335 * @since MU 335 * @since MU (3.0.0) 336 336 * 337 337 * @param string $context A string describing the steps of the sign-up process. The value can be … … 349 349 * Validate a new site signup. 350 350 * 351 * @since MU 351 * @since MU (3.0.0) 352 352 * 353 353 * @return null|bool True if site signup was validated, false if error. … … 402 402 * Use the {@see 'add_signup_meta'} filter instead. 403 403 * 404 * @since MU 404 * @since MU (3.0.0) 405 405 * @deprecated 3.0.0 Use the {@see 'add_signup_meta'} filter instead. 406 406 * … … 436 436 * Confirm a new site signup. 437 437 * 438 * @since MU 438 * @since MU (3.0.0) 439 439 * @since 4.4.0 Added the `$blog_id` parameter. 440 440 * … … 491 491 * Setup the new user signup process 492 492 * 493 * @since MU 493 * @since MU (3.0.0) 494 494 * 495 495 * @param string $user_name The username. … … 565 565 * Validate the new user signup 566 566 * 567 * @since MU 567 * @since MU (3.0.0) 568 568 * 569 569 * @return bool True if new user signup was validated, false if error … … 595 595 * New user signup confirmation 596 596 * 597 * @since MU 597 * @since MU (3.0.0) 598 598 * 599 599 * @param string $user_name The username … … 616 616 * Setup the new site signup 617 617 * 618 * @since MU 618 * @since MU (3.0.0) 619 619 * 620 620 * @param string $user_name The username. … … 679 679 * Validate new site signup 680 680 * 681 * @since MU 681 * @since MU (3.0.0) 682 682 * 683 683 * @return bool True if the site signup was validated, false if error … … 736 736 * New site signup confirmation 737 737 * 738 * @since MU 738 * @since MU (3.0.0) 739 739 * 740 740 * @param string $domain The domain URL
Note: See TracChangeset
for help on using the changeset viewer.