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
Sergey Biryukov
1834e8c45e
Update phpdoc for get_current_site(). props jeremyfelt. fixes #25040 .
...
Built from https://develop.svn.wordpress.org/trunk@25229
git-svn-id: http://core.svn.wordpress.org/trunk@25199 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-09-04 08:26:08 +00:00
Sergey Biryukov
5f45d9b482
Use an array as a default value for $meta in multisite signup-related functions. fixes #25149 .
...
Built from https://develop.svn.wordpress.org/trunk@25205
git-svn-id: http://core.svn.wordpress.org/trunk@25177 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-09-02 03:33:09 +00:00
Andrew Nacin
7a8981a38c
Case insensitivity for is_email_address_unsafe().
...
props jkudish.
fixes #25046 .
Built from https://develop.svn.wordpress.org/trunk@25197
git-svn-id: http://core.svn.wordpress.org/trunk@25169 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-08-31 04:36:10 +00:00
Andrew Nacin
5a312f71f6
Revert [23307] so new users in multisite are not automatically subscribers on the main site.
...
props duck_.
fixes #25166 for trunk.
see #15627 .
Built from https://develop.svn.wordpress.org/trunk@25183
git-svn-id: http://core.svn.wordpress.org/trunk@25155 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-08-30 16:29:12 +00:00
Sergey Biryukov
cbd1895437
Avoid a PHP notice in wpmu_create_blog() if $meta is not passed. props duck_, jeremyfelt, SergeyBiryukov. fixes #20793 .
...
Built from https://develop.svn.wordpress.org/trunk@25127
git-svn-id: http://core.svn.wordpress.org/trunk@25107 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-08-26 18:57:10 +00:00
Sergey Biryukov
fdef243bf6
Deprecate $network_id argument in get_blog_count(). props jeremyfelt. fixes #25129 .
...
Built from https://develop.svn.wordpress.org/trunk@25113
git-svn-id: http://core.svn.wordpress.org/trunk@25094 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-08-24 02:42:10 +00:00
Andrew Nacin
527f73fbb7
Multisite: Add a filter to get_space_allowed() and increase its internal default value to the network default.
...
props jkudish for initial patch.
fixes #23650 .
Built from https://develop.svn.wordpress.org/trunk@25092
git-svn-id: http://core.svn.wordpress.org/trunk@25076 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-08-22 20:55:08 +00:00
Ryan Boren
f2f939fed4
Pinking shears
...
Built from https://develop.svn.wordpress.org/trunk@25085
git-svn-id: http://core.svn.wordpress.org/trunk@25069 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-08-22 15:56:08 +00:00
Dominik Schilling
029e4cf3a6
Remove references to unused globals. props jeremyfelt. fixes #24984 .
...
Built from https://develop.svn.wordpress.org/trunk@25018
git-svn-id: http://core.svn.wordpress.org/trunk@25009 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-08-15 03:13:05 +00:00
Ryan Boren
0e923a5c9d
Deprecate get_dashboard_blog().
...
Remove contextual help for Dashboard Site from the network settings screen.
Props sillybean, ocean90
fixes #24838
git-svn-id: http://core.svn.wordpress.org/trunk@24993 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-08-06 16:07:46 +00:00
Andrew Nacin
5c20d1eca1
Remove "special" multisite spam check in the authentication API.
...
The spamming of a site no longer directly affects a user of said site.
Moves the spam check to the wp_authenticate filter. Networks in need
of enhanced spam-fighting should leverage this same technique.
Allow is_user_spammy() to accept a WP_User object.
props willnorris, brianhogg.
fixes #24771 . see #19714 .
git-svn-id: http://core.svn.wordpress.org/trunk@24848 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-07-29 03:23:51 +00:00
Andrew Nacin
483f887c59
SMH.
...
git-svn-id: http://core.svn.wordpress.org/trunk@24155 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-05-01 18:39:56 +00:00
Andrew Nacin
c39b14a486
Better logic for preg_match() calls in ms-functions.php. fixes #24222 .
...
git-svn-id: http://core.svn.wordpress.org/trunk@24130 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-04-29 14:49:57 +00:00
Ryan Boren
0f304375f9
Fire the update_blog_public action from update_blog_status() instead of update_blog_public(). Pass blog ID and value to the action.
...
Add code to noindex() to sync the 'public' value in the site options table with the blog_public value in the options table.
fixes #23155
git-svn-id: http://core.svn.wordpress.org/trunk@23794 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-03-25 09:29:58 +00:00
Sergey Biryukov
f86b1502a0
Fix fatal error in WP_User_Query when searching users by URL. Move wp_is_large_network() to wp-includes. fixes #23683 for trunk.
...
git-svn-id: http://core.svn.wordpress.org/trunk@23664 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-03-12 09:19:55 +00:00
Sergey Biryukov
de4d2b5e7a
Use correct variable. see [23592]. see #21767 .
...
git-svn-id: http://core.svn.wordpress.org/trunk@23595 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-03-03 22:04:33 +00:00
Ryan Boren
c08e7e0a12
In ms-functions.php, remove unnecessary slashing, don't strip the return of get_site_option, s/stripslashes*/wp_unslash/.
...
see #21767
git-svn-id: http://core.svn.wordpress.org/trunk@23592 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-03-03 16:55:53 +00:00
Ryan Boren
43a7e695e9
Revert 23416, 23419, 23445 except for wp_reset_vars() changes. We are going a different direction with the slashing cleanup, so resetting to a clean slate. see #21767
...
git-svn-id: http://core.svn.wordpress.org/trunk@23554 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-03-01 16:28:40 +00:00
Andrew Nacin
e3f7973355
Remove direct call to add_new_user_to_blog() as this is already hooked into wpmu_activate_user.
...
The second argument passed by that hook is not $email, so let's change that. It is not used.
props wonderboymusic.
fixes #15173 .
git-svn-id: http://core.svn.wordpress.org/trunk@23535 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-02-28 20:28:36 +00:00