Jeremy Felt
54512d64cb
MS: Use `*_network_option()` functions throughout core.
...
Replaces all uses of `*_site_option()` with the corresponding "network" function.
This excludes one usage in `wp-admin/admin-footer.php` that needs more investigation.
Props spacedmonkey.
See #28290 .
Built from https://develop.svn.wordpress.org/trunk@34778
git-svn-id: http://core.svn.wordpress.org/trunk@34743 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-10-02 19:08:26 +00:00
John Blackbourn
ea28454867
Deprecate `get_admin_users_for_domain()`. This function has never been used in core.
...
Fixes #34122
Built from https://develop.svn.wordpress.org/trunk@34755
git-svn-id: http://core.svn.wordpress.org/trunk@34720 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-10-01 22:27:24 +00:00
John Blackbourn
f33c6a6650
This function is blessed.
...
Built from https://develop.svn.wordpress.org/trunk@34754
git-svn-id: http://core.svn.wordpress.org/trunk@34719 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-10-01 22:24:24 +00:00
John Blackbourn
d0d9e4c8d8
Deprecate `create_empty_blog()`. This function has never been used in core.
...
Fixes #34120
Built from https://develop.svn.wordpress.org/trunk@34753
git-svn-id: http://core.svn.wordpress.org/trunk@34718 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-10-01 22:10:26 +00:00
Jeremy Felt
d5b2929dbb
Docs: Clarify `$user` parameter documentation in `wpmu_validate_blog_signup`.
...
See #32246 .
Built from https://develop.svn.wordpress.org/trunk@34676
git-svn-id: http://core.svn.wordpress.org/trunk@34640 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-09-29 01:33:27 +00:00
Scott Taylor
2c30a11518
After [34577], alter `wp_xmlrpc_server::mw_newMediaObject()` to check upload space in multisite.
...
See #21292 .
Built from https://develop.svn.wordpress.org/trunk@34603
git-svn-id: http://core.svn.wordpress.org/trunk@34567 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-09-26 19:49:25 +00:00
Boone Gorges
9d7a685a20
Multisite: Don't limit site titles to 50 chars.
...
This restriction dates from ye olden times, ie https://mu.trac.wordpress.org/changeset/1140 .
It is no longer relevant.
Props chriscct7, theode.
Fixes #33973 .
Built from https://develop.svn.wordpress.org/trunk@34455
git-svn-id: http://core.svn.wordpress.org/trunk@34419 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-09-23 14:24:24 +00:00
Drew Jaynes
c5fede78e0
Docs: Include 'wp-json' in the 4.4.0 changelog entry for the `subdirectory_reserved_names` filter.
...
'wp-json' was appended to the reserved names list in [34375].
See #33789 . See #32246 .
Built from https://develop.svn.wordpress.org/trunk@34384
git-svn-id: http://core.svn.wordpress.org/trunk@34348 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-09-22 09:44:27 +00:00
Scott Taylor
c60b00fc20
Multisite: as a precaution, make `wp-json` a reserved subdirectory name.
...
Props austinginder.
Fixes #33789 .
Built from https://develop.svn.wordpress.org/trunk@34375
git-svn-id: http://core.svn.wordpress.org/trunk@34339 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-09-22 04:21:25 +00:00
Drew Jaynes
fd60f500c3
Docs: Add a changelog entry for the addition of 'wp-admin', 'wp-content', and 'wp-includes' as reserved names for the `subdirectory_reserved_names` filter docs.
...
The new names were introduced in [33952].
See #33615 . See #32246 .
Built from https://develop.svn.wordpress.org/trunk@34235
git-svn-id: http://core.svn.wordpress.org/trunk@34199 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-09-16 13:26:26 +00:00
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
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
Andrew Nacin
8fe09a809c
In insert_blog(), make sure we retrieve the insertion ID from wpdb before calling a function that could invoke queries. props feedmeastraycat. fixes #23400 .
...
git-svn-id: http://core.svn.wordpress.org/trunk@23511 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-02-28 16:53:48 +00:00
Andrew Nacin
8252213fde
Deprecate get_user_id_from_string() in favor of get_user_by( $field ) where $field is 'email' or 'login'. props SergeyBiryukov. fixes #23190 .
...
git-svn-id: http://core.svn.wordpress.org/trunk@23438 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-02-16 03:02:15 +00:00
Sergey Biryukov
36d32c0504
Use wp_get_current_user(). props nacin. see #23192 .
...
git-svn-id: http://core.svn.wordpress.org/trunk@23432 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-02-15 18:13:18 +00:00
Sergey Biryukov
df725c13c0
Replace get_user_id_from_string() with get_user_by(). props ocean90, bananastalktome. fixes #23192 . see #23190 .
...
git-svn-id: http://core.svn.wordpress.org/trunk@23431 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-02-15 18:00:52 +00:00
Ryan Boren
cc5ed3a485
Change all core API to expect unslashed rather than slashed arguments.
...
The exceptions to this are update_post_meta() and add_post_meta() which are often used by plugins in POST handlers and will continue accepting slashed data for now.
Introduce wp_upate_post_meta() and wp_add_post_meta() as unslashed alternatives to update_post_meta() and add_post_meta(). These functions could become methods in WP_Post so don't use them too heavily yet.
Remove all escape() calls from wp_xmlrpc_server. Now that core expects unslashed data this is no longer needed.
Remove addslashes(), addslashes_gpc(), add_magic_quotes() calls on data being prepared for handoff to core functions that until now expected slashed data. Adding slashes in no longer necessary.
Introduce wp_unslash() and use to it remove slashes from GPCS data before using it in core API. Almost every instance of stripslashes() in core should now be wp_unslash(). In the future (a release or three) when GPCS is no longer slashed, wp_unslash() will stop stripping slashes and simply return what is passed. At this point wp_unslash() calls can be removed from core.
Introduce wp_slash() for slashing GPCS data. This will also turn into a noop once GPCS is no longer slashed. wp_slash() should almost never be used. It is mainly of use in unit tests.
Plugins should use wp_unslash() on data being passed to core API.
Plugins should no longer slash data being passed to core. So when you get_post() and then wp_insert_post() the post data from get_post() no longer needs addslashes(). Most plugins were not bothering with this. They will magically start doing the right thing. Unfortunately, those few souls who did it properly will now have to avoid calling addslashes() for 3.6 and newer.
Use wp_kses_post() and wp_kses_data(), which expect unslashed data, instead of wp_filter_post_kses() and wp_filter_kses(), which expect slashed data. Filters are no longer passed slashed data.
Remove many no longer necessary calls to $wpdb->escape() and esc_sql().
In wp_get_referer() and wp_get_original_referer(), return unslashed data.
Remove old stripslashes() calls from WP_Widget::update() handlers. These haven't been necessary since WP_Widget.
Switch several queries over to prepare().
Expect something to break.
Props alexkingorg
see #21767
git-svn-id: http://core.svn.wordpress.org/trunk@23416 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-02-14 22:51:06 +00:00
Sergey Biryukov
08269aa6b0
Remove unused error string. props pavelevap. fixes #22107 .
...
git-svn-id: http://core.svn.wordpress.org/trunk@23412 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-02-14 05:36:28 +00:00
Mark Jaquith
6b6ba31884
Properly wipe capabilities from new site-independent multisite users by using the right key.
...
props wonderboymusic. fixes #15627
git-svn-id: http://core.svn.wordpress.org/trunk@23307 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-01-18 15:30:55 +00:00
Andrew Nacin
72d8ca4770
Use $current_site->path instead of $base in wpmu_validate_blog_signup(), as $base is now dead. props MarkJaquith. fixes #22787 . see #19796 .
...
git-svn-id: http://core.svn.wordpress.org/trunk@23107 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-12-06 09:43:52 +00:00
Andrew Nacin
3287c609a1
Make the return of is_upload_space_available() more obvious. props georgestephanis. see #22585 .
...
git-svn-id: http://core.svn.wordpress.org/trunk@22861 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-27 03:42:02 +00:00
Ryan Boren
8dc401468e
Make is_upload_space_available() available for front end page loads. Fixes fatal error when calling wp_editor() from the front end.
...
Props scribu, itworx
fixes #22585
git-svn-id: http://core.svn.wordpress.org/trunk@22840 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-26 14:42:43 +00:00
Peter Westwood
b2ca616d1e
Multisite: Move all the functions which calculate upload space usage to wp-includes so they apply correctly with front-end editors.
...
Fixes #22357 props wonderboymusic.
git-svn-id: http://core.svn.wordpress.org/trunk@22497 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-09 10:35:42 +00:00
Andrew Nacin
1d312da957
Fix the matching in is_email_address_unsafe(), which was too aggressive.
...
We should only check to see if the user's email address has the same
domain as or is a subdomain of any banned email domain.
Add a filter.
props mdawaffe.
fixes #21570 .
git-svn-id: http://core.svn.wordpress.org/trunk@22461 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-08 01:06:17 +00:00
Andrew Nacin
dc40f18228
Merge some strings. props pavelevap. fixes #22306 .
...
git-svn-id: http://core.svn.wordpress.org/trunk@22430 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-07 19:37:54 +00:00
Andrew Nacin
3a86c87c31
Remove single-argument calls to wpdb:prepare(), which are invalid as nothing is being prepared. see #22262 .
...
git-svn-id: http://core.svn.wordpress.org/trunk@22428 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-07 19:28:08 +00:00
Ryan Boren
04a1ea0b39
Consolidate some transalted strings. Remove unnecessary trailing newlines. Props pavelevap. fixes #22274
...
git-svn-id: http://core.svn.wordpress.org/trunk@22308 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-10-25 22:21:15 +00:00
Peter Westwood
d30f0445e8
i18n: Fix the usage of sprintf replacements in the Multisite include files. See #22260 .
...
git-svn-id: http://core.svn.wordpress.org/trunk@22270 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-10-23 11:27:20 +00:00
Ryan Boren
51920e1858
Consolidate some strings. Props pavelevap, SergeyBiryukov. see #21728
...
git-svn-id: http://core.svn.wordpress.org/trunk@22124 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-10-05 19:04:34 +00:00
Andrew Nacin
61e0dc0122
Use 2 * DAY_IN_SECONDS rather than 172800. props pavelevap. fixes #20987 .
...
git-svn-id: http://core.svn.wordpress.org/trunk@22121 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-10-05 13:11:16 +00:00
Ryan Boren
9fc9d42d0a
* Register blog-id-cache group as global
...
* Introduce clean_blog_cache() so we can run it independently of refresh_blog_details() which assumes the blog still exists and get_blog_details() can be called.
* Don't db escape cache keys in get_blog_id_from_url()
* prepare() the query in get_blog_id_from_url()
* Return 0 for all failures in get_blog_id_from_url()
* clean_blog_cache() after dropping tables in wpmu_delete_blog() to make sure the cache is for real cleaned.
git-svn-id: http://core.svn.wordpress.org/trunk@22092 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-10-01 18:03:23 +00:00
Ryan Boren
115d53941b
Add domain_exists filter. Props jamescollins. fixes #21142
...
git-svn-id: http://core.svn.wordpress.org/trunk@22065 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-09-27 17:30:34 +00:00
Andrew Nacin
557d9313a7
Introduce constants to allow for easier expression of time periods in seconds. Adds MINUTE_IN_SECONDS, HOUR_IN_SECONDS, DAY_IN_SECONDS, WEEK_IN_SECONDS, YEAR_IN_SECONDS. props nbachiyski, SergeyBiryukov. fixes #20987 .
...
git-svn-id: http://core.svn.wordpress.org/trunk@21996 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-09-25 05:26:19 +00:00
Ryan Boren
1513f1daea
Suppress db errors when checking if the blog is already installed in install_blog(). Use DESCRIBE instead of SELECT. Props bpetty. fixes #21922
...
git-svn-id: http://core.svn.wordpress.org/trunk@21924 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-09-20 13:39:46 +00:00
Andrew Nacin
7ae797b119
Pass the user parameter to the wpmu_validate_blog_signup filter and wpmu_validate_blog_signup()'s return array. props BrianLayman. fixes #17306 .
...
git-svn-id: http://core.svn.wordpress.org/trunk@21860 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-09-15 20:05:58 +00:00
Andrew Nacin
923b3e8e0e
Pass current network ID to domain_exists() in wpmu_validate_blog_signup(). props larysa, fixes #17303 .
...
git-svn-id: http://core.svn.wordpress.org/trunk@21853 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-09-15 19:29:59 +00:00
Andrew Nacin
dc49f24a6c
Remove ms-files.php rewriting from WordPress multisite. fixes #19235 .
...
Keep existing networks compatible with a ms_files_rewriting network option.
git-svn-id: http://core.svn.wordpress.org/trunk@21823 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-09-11 22:22:20 +00:00
Ryan Boren
c55cf716da
Use set_url_scheme(). Props johnbillion, MarcusPope. see #19037 #20759
...
git-svn-id: http://core.svn.wordpress.org/trunk@21664 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-30 13:33:00 +00:00
Ryan Boren
2ea0626e5d
Use switch_to_blog()/restore_current_blog() in get_blog_post() and get_blog_permalink(). Eliminate the duplicate caching in these functions. Return WP_Post from get_blog_post(). Update phpdoc. Remove global-posts cache invalidation. Props jondavidjohn fixes #21595
...
git-svn-id: http://core.svn.wordpress.org/trunk@21628 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-27 16:22:45 +00:00
nacin
7127ed1197
Move most instances of new WP_User to get_userdata(). see #21120 .
...
git-svn-id: http://core.svn.wordpress.org/trunk@21413 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-03 01:06:05 +00:00
westi
4443baaab9
Multisite: Rework the upload space usage tracking code so as to be fully pluggable.
...
* Moves some admin only functions into wp-admin/includes/ms.php from wp-includes/ms-functions.php
* Reworked the variable naming to be more in line with the Coding Standards
* Introduced a new get_space_used() function instead of calculating it in multiple places.
Fixes #21181 props dllh and jkudish for inital work on this.
git-svn-id: http://core.svn.wordpress.org/trunk@21387 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-01 13:52:06 +00:00
markjaquith
3b46a53530
Do not block XML-RPC uploads when upload_space_check_disabled is true, regardless of fileupload_maxk value. props SergeyBiryukov. fixes #16217
...
git-svn-id: http://core.svn.wordpress.org/trunk@21237 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-07-09 03:49:23 +00:00
nacin
b28de3ea1b
install_blog() should not be polluting the siteurl and home options with the trailing slash that comes from get_blogaddress_by_id().
...
git-svn-id: http://core.svn.wordpress.org/trunk@21172 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-06-28 20:38:16 +00:00
ryan
30e6bb654d
Rolling upgrade to set the welcome_user_email network-wide option via the welcome_user_msg_filter() callback. Fixes ability to save the welcome user email when no entry exists in the database. see #20116
...
git-svn-id: http://core.svn.wordpress.org/trunk@20697 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-05-02 20:31:37 +00:00
nacin
c68f8c46f0
Use maybe_serialize() where appropriate. fixes #19617 .
...
git-svn-id: http://svn.automattic.com/wordpress/trunk@20612 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-27 15:57:51 +00:00
ryan
80eb4cbe9b
Add terminal punctuation to some signup error messages. Props dllh. fixes #20332
...
git-svn-id: http://svn.automattic.com/wordpress/trunk@20441 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-11 20:41:59 +00:00
ryan
de41bc288b
Introduce WP_User::exists(). see #20372
...
git-svn-id: http://svn.automattic.com/wordpress/trunk@20378 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-04-06 19:18:45 +00:00
nacin
0730535015
Introduce $wpdb->delete(). props justindgivens, scribu. fixes #18948 .
...
git-svn-id: http://svn.automattic.com/wordpress/trunk@20287 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-03-24 15:24:31 +00:00
nacin
ae113fba5e
Pass WP_User object to the newuser_notify_siteadmin filter. props boonebgorges. fixes #20162 .
...
git-svn-id: http://svn.automattic.com/wordpress/trunk@20101 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-03-02 23:52:19 +00:00
nacin
86596214bd
Simplify matching code. see #19670 .
...
git-svn-id: http://svn.automattic.com/wordpress/trunk@19852 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-02-07 17:44:29 +00:00
ryan
1438d03330
Fix notices. Simplify checkbox logic. Props SergeyBiryukov. fixes #19670
...
git-svn-id: http://svn.automattic.com/wordpress/trunk@19850 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-02-07 17:12:46 +00:00
duck_
e1068113ac
Remove redundant logic from filter_SSL(). Props deltafactory. Fixes #19899 .
...
git-svn-id: http://svn.automattic.com/wordpress/trunk@19759 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-01-26 09:21:44 +00:00
nacin
b96deccca8
Use get_blog_prefix() in another MU function. see #19891 .
...
git-svn-id: http://svn.automattic.com/wordpress/trunk@19749 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-01-25 00:10:46 +00:00
nacin
b925695170
Use get_blog_prefix() in get_most_recent_post_of_user(). see #19891 .
...
git-svn-id: http://svn.automattic.com/wordpress/trunk@19748 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-01-25 00:09:30 +00:00
nacin
18804349bb
Remove copy-pasted comment from upload_is_user_over_quota()'s phpdoc. It came from recurse_dirsize(). see #19879 .
...
git-svn-id: http://svn.automattic.com/wordpress/trunk@19747 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-01-24 23:54:24 +00:00
ryan
e3b46b25d3
Lose EOF ?>. Clean up EOF newlines. fixes #12307
...
git-svn-id: http://svn.automattic.com/wordpress/trunk@19712 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-01-08 17:01:11 +00:00
duck_
34b7010df8
Fix some mismatching parameter documentation. Props akshayagarwal, linuxologos. See #19756 .
...
git-svn-id: http://svn.automattic.com/wordpress/trunk@19695 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-01-06 11:42:00 +00:00
ryan
aa8a3f89d8
Use home_url() instead of site_url(). Props johnbillion. fixes #18293
...
git-svn-id: http://svn.automattic.com/wordpress/trunk@19674 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-01-04 19:29:03 +00:00
ryan
07ff8b216b
Use one space, not two, after trailing punctuation. fixes #19537
...
git-svn-id: http://svn.automattic.com/wordpress/trunk@19593 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2011-12-13 23:45:31 +00:00
nacin
cc50764a8b
They call me multisite. props ryan, zeo. see #19020 .
...
git-svn-id: http://svn.automattic.com/wordpress/trunk@19504 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2011-12-01 00:36:19 +00:00
nacin
56d46a1fe1
Send $user_id to is_super_admin() when checking to set primary_blog for a user in wpmu_create_blog(). see #19127 .
...
git-svn-id: http://svn.automattic.com/wordpress/trunk@19182 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2011-11-05 20:23:55 +00:00
ryan
b957c72f9a
Turn is_blog_user() into a wrapper around is_user_member_of_blog() and deprecate. Make user_id optional for is_user_member_of_blog(). Props SergeyBiryukov. fixes #16702
...
git-svn-id: http://svn.automattic.com/wordpress/trunk@19016 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2011-10-19 22:35:15 +00:00
ryan
a0f6c4469d
Introduce wp_get_db_schema() for rerieving the various flavors of the WP db schema. Eliminates need to use global. Allows multiple calls to wpmu_create_blog(). see #12028
...
git-svn-id: http://svn.automattic.com/wordpress/trunk@18899 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2011-10-06 00:21:24 +00:00
markjaquith
37e23be4ed
Be more consistent with ERROR: messages. fixes #15887
...
git-svn-id: http://svn.automattic.com/wordpress/trunk@18841 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2011-09-30 17:18:35 +00:00
ryan
6febc018a9
Deprecate wpmu_admin_redirect_add_updated_param() and wpmu_admin_do_redirect(). Props SergeyBiryukov. fixes #18619
...
git-svn-id: http://svn.automattic.com/wordpress/trunk@18834 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2011-09-30 15:13:13 +00:00
nacin
6edb31db27
Ensure we have a full blog object in get_active_blog_for_user(). fixes #18789 .
...
git-svn-id: http://svn.automattic.com/wordpress/trunk@18791 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2011-09-27 07:36:36 +00:00
duck_
37441fac3e
Fix copy+paste error in documentation. Props masonjames, SergeyBiryukov. Fixes #18545 .
...
git-svn-id: http://svn.automattic.com/wordpress/trunk@18768 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2011-09-24 19:37:34 +00:00
nacin
a4c18fc053
Use untrailingslashit in url_shorten() and recurse_dirsize(). Remove unnecessary camelCase variables. see #18592 .
...
git-svn-id: http://svn.automattic.com/wordpress/trunk@18637 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2011-09-05 16:53:19 +00:00
nacin
e53fe816b2
Instantiate some MS variables as objects before using them. Spaces not tabs for vertical alignment. Remove unnecessary conditional piece. props PeteMall, see #18049 .
...
git-svn-id: http://svn.automattic.com/wordpress/trunk@18560 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2011-08-17 17:49:57 +00:00
nacin
90f6899dd1
Use preg_match more efficiently. props solarissmoke, fixes #17287 .
...
git-svn-id: http://svn.automattic.com/wordpress/trunk@18524 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2011-08-10 19:18:18 +00:00
ryan
ef0ace0bbf
Return true upon success in remove_user_from_blog(). Props eightamrock. fixes #17344
...
git-svn-id: http://svn.automattic.com/wordpress/trunk@18510 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2011-08-04 16:36:50 +00:00
ryan
d6d3724e78
s/login/log in/. Props johnbillion. fixes #18294
...
git-svn-id: http://svn.automattic.com/wordpress/trunk@18486 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2011-07-29 21:34:43 +00:00
nacin
9e9cd7160a
Login is not a verb. props dcowgill, fixes #17770 .
...
git-svn-id: http://svn.automattic.com/wordpress/trunk@18289 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2011-06-12 08:00:22 +00:00
nacin
00f7846136
s/WordPress MU/WordPress/ and remove an unused sprintf param. props wpmuguru, fixes #17529 .
...
git-svn-id: http://svn.automattic.com/wordpress/trunk@18003 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2011-05-23 05:43:07 +00:00
ryan
1835dbf737
Check if empty to avoid noticed when signing up for username in multisite. Props jfarthing84, kawauso. fixes #16680
...
git-svn-id: http://svn.automattic.com/wordpress/trunk@17794 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2011-05-04 18:38:17 +00:00
markjaquith
c08a6a4044
restore_current_blog() in add_user_to_blog() and remove_user_from_blog() before early return, to avoid being stuck in a switched state. props mdawaffe. fixes #16444 for trunk.
...
git-svn-id: http://svn.automattic.com/wordpress/trunk@17379 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2011-02-03 00:17:30 +00:00
ryan
85f1feed84
Bring out the shears.
...
git-svn-id: http://svn.automattic.com/wordpress/trunk@17228 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2011-01-06 04:11:14 +00:00
nacin
d4ce1da900
Giant chunk of phpdoc for multisite functions. props boonebgorges, SergeyBiryukov. fixes #14953 .
...
git-svn-id: http://svn.automattic.com/wordpress/trunk@17218 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2011-01-04 09:02:38 +00:00
nacin
1b18b8e5f0
s/site/user/ if signup doesn't have a domain attached. props wpmuguru, fixes #15780 .
...
git-svn-id: http://svn.automattic.com/wordpress/trunk@16954 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-12-15 17:09:26 +00:00
ryan
93908c2670
Skip confirmation email fixes. Props ocean90, duck_. see #15725
...
git-svn-id: http://svn.automattic.com/wordpress/trunk@16949 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-12-15 16:04:19 +00:00
ryan
3ed654c847
Go back to sanitize_user() so that dots are allowed. Props ocean90. see #14910
...
git-svn-id: http://svn.automattic.com/wordpress/trunk@16848 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-12-09 19:29:00 +00:00
ryan
83d1c0bf29
Use santize_key() in more places. Props WraithKenny. fixes #14910
...
git-svn-id: http://svn.automattic.com/wordpress/trunk@16822 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-12-08 21:32:19 +00:00
markjaquith
4fbc3224d5
Get rid of niggling hardcoded blogs.dir path. props scribu. fixes #15383
...
git-svn-id: http://svn.automattic.com/wordpress/trunk@16738 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-12-06 03:35:33 +00:00
ryan
847499e531
Pinking shears
...
git-svn-id: http://svn.automattic.com/wordpress/trunk@16438 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-11-17 18:47:34 +00:00
ryan
0a1fa29fe2
Return false if upload_space_check_disabled is true in upload_is_user_over_quota(). Props SergeyBiryukov. fixes #14121
...
git-svn-id: http://svn.automattic.com/wordpress/trunk@16299 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-11-11 16:03:51 +00:00
westi
ae213c99ca
Generate Human Readable passwords as they are much more userfriendly. Fixes #13324 props Otto42.
...
git-svn-id: http://svn.automattic.com/wordpress/trunk@16284 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-11-10 23:31:54 +00:00
nacin
a8eb3d747d
Revert [16021]. See #14170 .
...
git-svn-id: http://svn.automattic.com/wordpress/trunk@16213 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-11-05 21:35:28 +00:00
westi
037fae5ae6
Don't mangle the primary_blog option when trying to fix it. Don't set people to be a subscriber on a blog they already have a role for. See #15316
...
git-svn-id: http://svn.automattic.com/wordpress/trunk@16179 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-11-04 09:31:58 +00:00
westi
2855be97ac
When adding a user to the blog pass in the current blog id. See #15316 .
...
git-svn-id: http://svn.automattic.com/wordpress/trunk@16178 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-11-04 09:06:45 +00:00
scribu
4eb0f634b2
Trigger activation hooks for netork plugins when new site is created. See #14170
...
git-svn-id: http://svn.automattic.com/wordpress/trunk@16021 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-10-27 19:41:59 +00:00
nacin
c64766e6f2
s/ms-options/settings. props PeteMall, fixes #14826 .
...
git-svn-id: http://svn.automattic.com/wordpress/trunk@15899 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-10-21 17:09:15 +00:00
ryan
669a403b55
Update network-wide active user and blog counts via a cron job to avoid costly count queries. see #15170
...
git-svn-id: http://svn.automattic.com/wordpress/trunk@15875 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-10-20 20:22:14 +00:00
nacin
5e1184aa57
Pinking shears.
...
git-svn-id: http://svn.automattic.com/wordpress/trunk@15843 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-10-19 07:48:22 +00:00
ryan
9c31fd7c70
First pass of user admin. Network admin and screen cleanups. see #14696
...
git-svn-id: http://svn.automattic.com/wordpress/trunk@15746 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-10-07 19:34:18 +00:00
ryan
ec07e220ad
Remove wordpressmu_wp_mail_from(). fixes #14586
...
git-svn-id: http://svn.automattic.com/wordpress/trunk@15678 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-10-01 18:32:47 +00:00
nacin
c63d9afdec
Some phpdoc for ms-functions.php. props boonebgorges. see #14953 .
...
git-svn-id: http://svn.automattic.com/wordpress/trunk@15675 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-09-29 23:44:34 +00:00
ryan
b5008205b5
Admin bar, first pass. see #14772
...
git-svn-id: http://svn.automattic.com/wordpress/trunk@15671 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-09-27 20:26:36 +00:00
scribu
91ab066e89
use get_user_count() in get_sitestats()
...
git-svn-id: http://svn.automattic.com/wordpress/trunk@15621 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-09-15 20:13:31 +00:00
nacin
4e283a8047
Return the character range removed in [15594]. fixes #14633 , props demetris.
...
git-svn-id: http://svn.automattic.com/wordpress/trunk@15595 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-09-07 17:52:43 +00:00
nacin
d66295976c
Speak in full, clear sentences. props mrmist, fixes #14633 .
...
git-svn-id: http://svn.automattic.com/wordpress/trunk@15594 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-09-07 15:28:56 +00:00
ryan
bb7ac14d8c
Pass more info to notification filters. Props mdawaffe. fixes #14743
...
git-svn-id: http://svn.automattic.com/wordpress/trunk@15552 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-08-31 18:19:15 +00:00
markjaquith
7944bd5d82
These are not verbs. http://notaverb.com/badbad_verbs
...
git-svn-id: http://svn.automattic.com/wordpress/trunk@15473 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-07-27 18:02:45 +00:00
nacin
113a26770f
Fix checking for whether WP_User object is actually a user. props filosofo, fixes #13903 for trunk.
...
git-svn-id: http://svn.automattic.com/wordpress/trunk@15404 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-07-13 21:27:05 +00:00
ryan
81e213c211
Use get_current_user() and get_current_user_id() instead of global . Props filofo. see #13934 for trunk
...
git-svn-id: http://svn.automattic.com/wordpress/trunk@15315 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-06-24 15:01:29 +00:00
dd32
d33463f89d
Fix typo in wpmu_signup_blog_notification() and wpmu_signup_user_notification(). Props mdawaffe. Fixes #14002 for trunk
...
git-svn-id: http://svn.automattic.com/wordpress/trunk@15290 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-06-20 04:12:03 +00:00
wpmuguru
d2517b7b02
removed unused validation from activation process, see #13760
...
git-svn-id: http://svn.automattic.com/wordpress/trunk@15186 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-06-10 00:10:12 +00:00
ryan
76036b069b
Deprecate get_most_active_blogs() and get_blog_list(). Props ocean90. fixes #13773
...
git-svn-id: http://svn.automattic.com/wordpress/trunk@15168 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-06-08 13:00:09 +00:00
wpmuguru
1c6f95023b
strip www before adding subdomain when creating new site
...
git-svn-id: http://svn.automattic.com/wordpress/trunk@15050 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-05-29 00:32:10 +00:00
wpmuguru
daba4756cc
don't clobber term if sitecategories doesn't exist, fixes 13482
...
git-svn-id: http://svn.automattic.com/wordpress/trunk@15042 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-05-28 20:03:29 +00:00
nacin
4e3c7fddd0
Prevent super admins from shooting themselves in the foot. props jorbin. Checks blog names against an array (filterable) of reserved keywords for subdirectory installs. fixes #13304 .
...
git-svn-id: http://svn.automattic.com/wordpress/trunk@14928 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-05-26 03:13:16 +00:00
wpmuguru
b8187fcd54
allow main site 404 URL to be filtered, fixes #12758
...
git-svn-id: http://svn.automattic.com/wordpress/trunk@14911 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-05-25 23:41:36 +00:00
nacin
8aae431b3a
Use a filter instead of a new NO404REDIRECT constant. see #12758 .
...
git-svn-id: http://svn.automattic.com/wordpress/trunk@14899 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-05-25 18:12:14 +00:00
donncha
22305da3a3
Cast "public" as an int to ensure it gets set correctly.
...
git-svn-id: http://svn.automattic.com/wordpress/trunk@14892 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-05-25 16:57:32 +00:00
wpmuguru
d8fe68385d
ensure unique term_id when global terms enabled, see #13482
...
git-svn-id: http://svn.automattic.com/wordpress/trunk@14872 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-05-25 07:24:10 +00:00
wpmuguru
6eb9b64e22
update rewrite rules for IIS, props Frumph, see #12758
...
git-svn-id: http://svn.automattic.com/wordpress/trunk@14871 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-05-25 05:12:47 +00:00
wpmuguru
569642dd32
give static var initial value, fixes #13517
...
git-svn-id: http://svn.automattic.com/wordpress/trunk@14867 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-05-25 00:31:07 +00:00
wpmuguru
a4e59b62eb
eliminate warning in global_terms(), global to static, fixes #13517
...
git-svn-id: http://svn.automattic.com/wordpress/trunk@14866 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-05-25 00:13:03 +00:00
donncha
e2edbfc768
Added $meta to "wpmu_new_blog" action
...
git-svn-id: http://svn.automattic.com/wordpress/trunk@14844 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-05-24 17:26:21 +00:00
westi
2b9d0dad68
Pass extra context to wpmu_new_blog.
...
git-svn-id: http://svn.automattic.com/wordpress/trunk@14484 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-05-06 19:36:20 +00:00
ryan
7b7243d94a
Strip trailing whites.
...
git-svn-id: http://svn.automattic.com/wordpress/trunk@14404 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-05-03 20:26:11 +00:00
ryan
172aa06718
Revert [14347] and [14372]. It broke more than we expected. Try again in 3.1. see #13051
...
git-svn-id: http://svn.automattic.com/wordpress/trunk@14374 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-05-03 18:16:22 +00:00
ryan
91354eefee
Escape links by default. Props alexkingorg. see #13051
...
git-svn-id: http://svn.automattic.com/wordpress/trunk@14347 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-05-02 22:53:59 +00:00
nacin
3a2f3b3433
s/blog/site/ in more places.
...
git-svn-id: http://svn.automattic.com/wordpress/trunk@14326 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-05-01 07:09:38 +00:00
nacin
e64a657575
s/blog/site/ in even more places. props PeteMall, see #11644 .
...
git-svn-id: http://svn.automattic.com/wordpress/trunk@14315 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-04-30 03:17:49 +00:00
donncha
7629767c24
Display the original username on the signup form on error, fixes #13124
...
git-svn-id: http://svn.automattic.com/wordpress/trunk@14298 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-04-29 16:05:33 +00:00
wpmuguru
e6fbceae9f
fix site administrator add user to site logic, see #12488
...
git-svn-id: http://svn.automattic.com/wordpress/trunk@14226 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-04-24 18:39:22 +00:00
nacin
aa8d6616a2
Single quotes are way cooler.
...
git-svn-id: http://svn.automattic.com/wordpress/trunk@14222 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-04-24 17:49:08 +00:00
nacin
5af1e0d69d
Make some branching look less crazy.
...
git-svn-id: http://svn.automattic.com/wordpress/trunk@14203 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-04-23 19:00:30 +00:00
ryan
9f33300139
Bring back delete on empty value for update_user_option() to preserve back compat. Switch to delete_user_option() in core. Props mdawaffe. fixes #13088
...
git-svn-id: http://svn.automattic.com/wordpress/trunk@14193 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-04-23 14:25:05 +00:00
dd32
442d41291a
Tweak new strings for better typography. Props demetris. Fixes #12962
...
git-svn-id: http://svn.automattic.com/wordpress/trunk@14070 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-04-11 10:41:54 +00:00
nacin
14e2cb8f6e
Don't set MIME headers in MS activation/welcome emails. fixes #12728 , props barry.
...
git-svn-id: http://svn.automattic.com/wordpress/trunk@14055 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-04-10 12:11:03 +00:00
wpmuguru
7edc8acfb9
remove extraneous blog name sanitization, props nbachiyski, fixes #12823
...
git-svn-id: http://svn.automattic.com/wordpress/trunk@14005 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-04-05 04:00:51 +00:00
nacin
c449adb237
File-level phpdoc for multisite files.
...
git-svn-id: http://svn.automattic.com/wordpress/trunk@13998 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-04-04 13:29:35 +00:00