Commit Graph

254 Commits

Author SHA1 Message Date
Boone Gorges
49803a45f3 Send multisite site/user signup emails via hooked functions.
Site and user signup notifications are moved to the new actions
`'after_signup_site'` and `'after_signup_user'`. Site and user activation
notifications are moved to the existing actions `'wpmu_activate_blog'` and
`'wpmu_activate_user'`.

Props dshanske, thomaswm, jeremyfelt.
See #33587..
Built from https://develop.svn.wordpress.org/trunk@34112


git-svn-id: http://core.svn.wordpress.org/trunk@34080 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-09-14 03:28:24 +00:00
Scott Taylor
3d8199c4eb Multisite: Don't allow sites to be created with the following reserved slugs: wp-admin, wp-content, wp-includes
Props austinginder.
Fixes #33615.

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


git-svn-id: http://core.svn.wordpress.org/trunk@33921 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-09-08 19:32:24 +00:00
Jeremy Felt
c122491c70 Exclude individual site directories when calculating space used for the main site.
* Add an `$exclude` parameter to `recurse_dirsize()`.
* Use this parameter in `get_dirsize()` to exclude `/sites` when on the main site.
* Add tests for main site and switched site.

Props @earnjam, @jeremyfelt.
Fixes #30202.

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


git-svn-id: http://core.svn.wordpress.org/trunk@33156 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-07-13 00:07:24 +00:00
Jeremy Felt
eee4049c92 Usernames in multisite should be restricted to 60 characters or fewer.
Only 60 characters can be stored in the database for a username, which could cause lookup issues when attempting to use similar usernames of extreme length.

Props @DJPaul.
See #17904, Fixes #26784.

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


git-svn-id: http://core.svn.wordpress.org/trunk@33054 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-07-04 05:53:24 +00:00
Dion Hulse
4df2bd0b2a Remove an undeeded space concatenation from wpmu_validate_user_signup().
This was previously used to prevent `strpos()` returning 0, which is not needed after r32942.
See #32444

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


git-svn-id: http://core.svn.wordpress.org/trunk@32921 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-06-26 01:39:25 +00:00
Scott Taylor
aaa99969e4 wpmu_validate_user_signup() should strictly check against false when using strpos().
See #32444.

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


git-svn-id: http://core.svn.wordpress.org/trunk@32913 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-06-25 16:57:26 +00:00
Scott Taylor
5c6b63d3a6 if is a statment, not a function.
See #32444.

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


git-svn-id: http://core.svn.wordpress.org/trunk@32771 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-06-16 20:01:25 +00:00
Scott Taylor
f888767c73 $status shouldn't be loosely compared to true in wp_xmlrpc_server::wp_deleteComment().
`$initial` shouldn't be loosely compared to `true` in `get_calendar()`.
`current_user_can()` shouldn't be loosely compared to `false` in `kses_init()`
`$get_all` shouldn't be loosely compared to `true` in `get_blog_details()`.
`is_array()` and `in_array()` shouldn't be loosely compared in `wpmu_validate_user_signup()`.
`$result` should by strictly compared in `check_ajax_referer()`.
`wp_verify_nonce()` should by strictly compared in `_show_post_preview()`.
`is_user_logged_in()` should not be loosly compared against `false` in `wp-signup.php`.

See #32444.

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


git-svn-id: http://core.svn.wordpress.org/trunk@32704 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-06-12 17:48:26 +00:00
Jeremy Felt
93ff65e677 Improve information displayed in a network's sites list table
* Better support for arbitrary domain/path combinations by displaying the URL in the primary column rather than Path or Domain.
* Show a cached count of total users per site as a more useful data point rather than the first 5 users.
* Clear that cached count of users for a site when a user is added to the site via `add_user_to_blog()`.

Props @ocean90.
Fixes #32434.

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


git-svn-id: http://core.svn.wordpress.org/trunk@32688 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-06-10 06:50:25 +00:00
Scott Taylor
19a3aacc94 Add @static* annotations where they are missing.
Initialize all static vars that are not, most to `null`.

See #32444.

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


git-svn-id: http://core.svn.wordpress.org/trunk@32620 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-05-29 15:43:29 +00:00
Scott Taylor
4d26d999ce Fix doc blocks for ms-*.php files.
A few functions can return a conditional instead of an `if`/`else` of `true`/`false`.

See #32444.

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


git-svn-id: http://core.svn.wordpress.org/trunk@32581 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-05-26 21:51:31 +00:00
Sergey Biryukov
77572cf024 Multisite: Add translator comments to default email messages with non-typical placeholders.
props yoavf.
fixes #32263.
Built from https://develop.svn.wordpress.org/trunk@32381


git-svn-id: http://core.svn.wordpress.org/trunk@32351 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-05-06 09:12:25 +00:00
Jeremy Felt
e4bfbcd9c1 Avoid an unexpected object error when syncing global terms
Pass the expected single value, rather than object, when recursively calling `global_terms()`.

Props hauvong.

See #31914, Fixes #31149.

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


git-svn-id: http://core.svn.wordpress.org/trunk@32043 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-04-07 04:14:26 +00:00
Jeremy Felt
5ac75b3b0a Use response code 200 when an existing network user joins a site via invitation.
Pass a response code of 200 to `wp_die()` when a user is successfully added to an individual site after using the `/newbloguser/` URL from an invite email. This is a user facing success message.

Props MikeHansenMe.

Fixes #31224.

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


git-svn-id: http://core.svn.wordpress.org/trunk@31495 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-02-22 22:30:25 +00:00
Sergey Biryukov
12f4004989 Replace generic "Dear user" greeting in email notifications with a more personalized one.
props Ipstenu.
fixes #31217.
Built from https://develop.svn.wordpress.org/trunk@31403


git-svn-id: http://core.svn.wordpress.org/trunk@31384 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-02-10 07:47:27 +00:00
Drew Jaynes
9a17233ca1 Fix an inaccurate summary and description in the DocBlock for wpmu_validate_user_signup().
Props ericlewis.
Fixes #31141.

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


git-svn-id: http://core.svn.wordpress.org/trunk@31277 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-01-29 11:46:22 +00:00
Scott Taylor
0f6d0b84d1 Remove unused local vars in delete_plugins(), delete_theme(), WP_Date_Query->validate_date_values(), global_terms(), and WP_Text_Diff_Renderer_Table->_changed().
This will clear out the "Unused Code" label in the next Scrutinizer report.

See #30799.

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


git-svn-id: http://core.svn.wordpress.org/trunk@31198 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-01-16 21:19:22 +00:00
Scott Taylor
fe6b5983df In PHP 5.0.0, is_a() became deprecated in favour of the instanceof operator. Calling is_a() would result in an E_STRICT warning.
In PHP 5.3.0, `is_a()` is no longer deprecated, and will therefore no longer throw `E_STRICT` warnings.

To avoid warnings in PHP < 5.3.0, convert all `is_a()` calls to `$var instanceof WP_Class` calls.

`instanceof` does not throw any error if the variable being tested is not an object, it simply returns `false`.

Props markoheijnen, wonderboymusic.
Fixes #25672.

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


git-svn-id: http://core.svn.wordpress.org/trunk@31169 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-01-16 01:06:24 +00:00
Scott Taylor
fc843ce4d0 There are some random add_action() and add_filter() calls littered around some files in wp-includes/. These should be moved to wp-includes/default-filters.php with the rest of the registered hooks. It seems like this was the best practice for awhile and then we randomly stopped. This file loads way before any of the includes, so the hooks will be registered for any request that loads WordPress, even SHORTINIT - a lot of the hooks registered won't run anyways (that's already the case).
See #30947.

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


git-svn-id: http://core.svn.wordpress.org/trunk@31149 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-01-12 16:40:23 +00:00
Andrew Nacin
1cf7a49ffd Adjust [29806] and revert [29807] to restore placeholder and email copy order.
Avoids unnecessarily changing a (large, carefully formatted) translated string from 4.0.

fixes #21089.

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


git-svn-id: http://core.svn.wordpress.org/trunk@30732 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-12-05 01:15:26 +00:00
Scott Taylor
a0df295f5c Improve various @param docs.
See #30224.

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


git-svn-id: http://core.svn.wordpress.org/trunk@30664 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-11-30 23:24:25 +00:00
John Blackbourn
3a4f742175 Remove the wp_is_trusted_network() function pending further discussion on terminology and behaviour.
See #30145

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


git-svn-id: http://core.svn.wordpress.org/trunk@30567 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-11-26 19:27:23 +00:00
Jeremy Felt
c47552dc6d Create new $wp_roles object in install_blog() to avoid protected _init() call
Our call to `$wp_roles->_init()` relied on the `__call()` method in `WP_Roles` to handle the link to the protected method. This works back to PHP 5.2.9, when a bug was fixed allowing access to protected methods through this exact approach.

`install_blog()` needs a fresh `$wp_roles` object after `populate_roles()` resets everything in its path. We can create this new object from scratch, effectively doing the same thing with the call to `_init()` via the constructor.

Fixes #29692 for trunk.

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


git-svn-id: http://core.svn.wordpress.org/trunk@30242 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-11-05 05:12:22 +00:00
Scott Taylor
892be738b0 Make the docs type for return in wpmu_create_user() more specific.
See #30224.

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


git-svn-id: http://core.svn.wordpress.org/trunk@30165 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-11-01 22:33:21 +00:00
Drew Jaynes
f8657d5890 Remove redundant and erroneous @uses tag from most core inline documentation.
Per our inline documentation standards, no further use of the `@uses` tag is recommended as used and used-by relationships can be derived through other means. This removes most uses of the tag in core documentation, with remaining tags to be converted to `@global` or `@see` as they apply.

Fixes #30191.

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


git-svn-id: http://core.svn.wordpress.org/trunk@30105 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-10-30 01:05:24 +00:00
Jeremy Felt
027d026077 Introduce wp_is_trusted_network()
A first step to establish concepts around trusted and untrusted networks.

* Will always return false as default.
* Will one day have a filter.

Fixes #30145

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


git-svn-id: http://core.svn.wordpress.org/trunk@30071 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-10-28 20:56:22 +00:00
Scott Taylor
258496edb6 In the wp_new_blog_notification() email template, include the login url.
Props obenland, georgestephanis.
Fixes #21089.

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


git-svn-id: http://core.svn.wordpress.org/trunk@29572 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-10-02 01:28:16 +00:00
Sergey Biryukov
0e28457536 * Declare $site_mimes before using it in check_upload_mimes().
* Use the same default value for 'upload_filetypes' as on Network Settings screen.

props rmccue.
fixes #29512 for trunk.
Built from https://develop.svn.wordpress.org/trunk@29718


git-svn-id: http://core.svn.wordpress.org/trunk@29492 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-09-07 10:11:17 +00:00
Scott Taylor
0233933f22 get_blog_details()->post_count should update on more actions than just publish_post.
Adds unit test.

Props 5um17, midxcat, strangerstudios.
Fixes #27952.

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


git-svn-id: http://core.svn.wordpress.org/trunk@28639 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-06-26 00:53:15 +00:00
Scott Taylor
fcd6920bb8 In is_user_option_local(), $user_id is set conditionally, but never used.
See #27882.

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


git-svn-id: http://core.svn.wordpress.org/trunk@28377 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-05-22 19:18:14 +00:00
Andrew Nacin
525b9145f8 Use correct column name. See [27152].
props barry.
fixes #25545.

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


git-svn-id: http://core.svn.wordpress.org/trunk@27668 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-03-29 03:39:14 +00:00
Andrew Nacin
c3ca81ba94 Always decode special characters for email subjects.
props tlovett1, jeremyfelt.
fixes #25346.

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


git-svn-id: http://core.svn.wordpress.org/trunk@27636 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-03-28 02:44:15 +00:00
Andrew Nacin
5a873ec0c6 Ensure the $path is trailing-slashed in domain_exists().
props ejdanderson, ericmann.
fixes #18209.

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


git-svn-id: http://core.svn.wordpress.org/trunk@27556 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-03-25 17:32:16 +00:00
Scott Taylor
f307aa1eb8 In remove_user_from_blog(), avoid a potentially expensive IN query before invalidating the reassigned post and link caches.
Props kovshenin.
Fixes #25545. (Again.)


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


git-svn-id: http://core.svn.wordpress.org/trunk@27027 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-02-11 16:28:13 +00:00
Scott Taylor
c2adc15b45 Collect the post and link ids that will be reassigned before running the update in remove_user_from_blog(). Use array_walk() instead of array_map() when invalidating the caches for the collected ids.
Props kovshenin.
Fixes #25545.


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


git-svn-id: http://core.svn.wordpress.org/trunk@27019 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-02-09 21:47:12 +00:00
Scott Taylor
274d2925b9 Invalidate the post cache for posts associated with a user who has been removed from a blog in remove_user_from_blog(). Adds a unit test.
Props nprasath002 for the initial patch.
Fixes #25545.


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


git-svn-id: http://core.svn.wordpress.org/trunk@26959 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-02-04 04:13:12 +00:00
Drew Jaynes
e2a921a6ed Inline documentation for hooks in wp-includes/ms-functions.php.
Props ShinichiN, ericlewis, rzen.
Fixes #25598.

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


git-svn-id: http://core.svn.wordpress.org/trunk@26430 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-12-02 20:45:10 +00:00
Mark Jaquith
22c6024f9e Remove unnecessarily gendered pronouns.
fixes #26225

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


git-svn-id: http://core.svn.wordpress.org/trunk@26269 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-11-25 02:05:10 +00:00
Scott Taylor
da05f7435b For unit tests that call wpmu_create_blog(), Blog factory, or installation code that attempts to clear transients: suppress database errors on setUp and restore on tearDown.
There are a few places in core that were preventing this from working by explicity setting `$wpdb->suppress_errors` to `false`. Instead, they should inherit the value that existed before errors were suppressed.

This allows Multisite unit tests to run without explosive database errors, and allows `$wpdb->suppress_errors` to be overridden all the way down the chain.

Fixes #26102.

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


git-svn-id: http://core.svn.wordpress.org/trunk@26158 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-11-18 20:45:11 +00:00
Sergey Biryukov
74f77b85a6 Use get_current_site() instead of the $current_site global when possible.
props jeremyfelt.
fixes #25158.
Built from https://develop.svn.wordpress.org/trunk@26120


git-svn-id: http://core.svn.wordpress.org/trunk@26032 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-11-13 03:23:10 +00:00
Drew Jaynes
2d58250bea Improve inline documentation for the wp_get_sites() return value.
Fixes #25645.

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


git-svn-id: http://core.svn.wordpress.org/trunk@25862 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-10-24 22:58:32 +00:00
Andrew Nacin
8ae8e01b67 Remove the old wp_auto_updates_maybe_update cron event. Schedule the new wp_maybe_auto_update event at 7 a.m. and 7 p.m. in the site's timezone.
see #27704.

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


git-svn-id: http://core.svn.wordpress.org/trunk@25825 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-10-24 22:53:14 +00:00
Drew Jaynes
56f3f3de4e Improve inline documentation for the wp_get_sites() return value.
Fixes #25645.

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


git-svn-id: http://core.svn.wordpress.org/trunk@25774 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-10-22 05:48:09 +00:00
Andrew Nacin
0e959f06dc Live network counts of users and sites for small networks.
props adamsilverstein, jeremyfelt.
fixes #22917.

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


git-svn-id: http://core.svn.wordpress.org/trunk@25538 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-09-25 16:21:09 +00:00
Andrew Nacin
3db7b4a7a3 Revert [25446] now that wp_blogs.archived is no longer an ENUM field. see #14511.
Built from https://develop.svn.wordpress.org/trunk@25590


git-svn-id: http://core.svn.wordpress.org/trunk@25507 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-09-24 01:20:09 +00:00
Sergey Biryukov
df34477308 Introduce 'offset' parameter for wp_get_sites().
props jamescollins.
see #14511.
Built from https://develop.svn.wordpress.org/trunk@25488


git-svn-id: http://core.svn.wordpress.org/trunk@25409 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-09-19 01:47:09 +00:00
Sergey Biryukov
d87a375483 Use wp_parse_id_list() to parse the 'network_id' parameter in wp_get_sites().
props jamescollins.
see #14511.
Built from https://develop.svn.wordpress.org/trunk@25487


git-svn-id: http://core.svn.wordpress.org/trunk@25408 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-09-19 01:20:09 +00:00
Andrew Nacin
1f507db1c0 Proper treatment of the 'archived' field in wp_get_sites(). see #14511.
Built from https://develop.svn.wordpress.org/trunk@25446


git-svn-id: http://core.svn.wordpress.org/trunk@25367 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-09-14 23:10:10 +00:00
Andrew Nacin
efdaf1e915 Introduce wp_get_sites(), a long-awaited replacement for get_blog_list().
props jeremyfelt.
see #14511.

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


git-svn-id: http://core.svn.wordpress.org/trunk@25366 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-09-14 21:13:10 +00:00
Scott Taylor
13d5ff7090 * Fill in undefined var in Tests_Option_BlogOption
* Add `defined()` check for `BLOGSUPLOADDIR`
* Suppress deprecated function notices for `is_blog_user()` and `get_dashboard_blog()`
* Check existence of `$user` in `wpmu_log_new_registrations()` before arbitrarily making a database query

Fixes all notices in multisite unit tests.

See #25282.


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


git-svn-id: http://core.svn.wordpress.org/trunk@25328 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-09-12 07:17:11 +00:00