Commit Graph

10212 Commits

Author SHA1 Message Date
Ryan Boren
20a1def1c0 switch_to_blog() and restore_current_blog() housekeeping.
wp-includes/admin-bar.php:

* Replace get_admin_url() and get_home_url() with admin_url() and home_url() and place them inside a switch/restore. Likewise replace current_user_can_for_blog() with current_user_can(). This avoids doing multiple switch restores.

wp-includes/ms-blogs.php:

* Deprecate the $validate argument to switch_to_blog(). This avoids a not very necessary call to get_blog_details(), possibly saving a few queries.
* Use $_wp_switched and $_wp_switched_stack instead of $switched and $switched_stack to make it less likely these globals will be stomped.
* Use GLOBALS to access blog_id and other globals. I've preferred this style lately since it makes it obvious a global is being used and avoids global blog_id being stomped by a local variable.
* Lose some is_object() checks. wp_get_current_user() always returns an object, for example.
* Call the new WP_Roles::reinit() method.

wp-includes/class-wp-xmlrpc-server.php:

* Replace current_user_can_for_blog() with current_user_can() and move it inside the switch/restore pair. This eliminates a switch/restore.

wp-includes/capabilities.php:

* Use array_keys() instead of $role => $data since $data is unused. I *think* this is a bit faster.
* Introduce WP_Roles::reinit(). This reinitializes WP_Roles and is used after switch_to_blog() has already update the blog ID in the wpdb object. If a global roles array is being used instead of the db, reinit is skipped.
* current_user_can_for_blog() now does a switch/restore. It didn't before meaning it could be reinitializing the user with the wrong role information for the current blog.

wp-includes/ms-settings.php:

* Define $_wp_switched_stack and $_wp_switched. This way switch_to_blog() and restore_current_blog() can rely on it being set.

wp-settings.php:

* Instantiate the WP_Roles global. This was it is always defined during init. To remove the WP_Roles checks from WP_Role and WP_User this would probably have to move before plugins are loaded, which might not be a good thing.

wp-includes/functions.php:

* Update wp_upload_dir() to reference _wp_switched.



git-svn-id: https://develop.svn.wordpress.org/trunk@21485 602fd350-edb4-49c9-b593-d223f7449a82
2012-08-09 16:28:15 +00:00
Ryan Boren
fd52f7397d Move get_current_blog_id() to load.php so it is available during multisite bootstrap. fixes #21432
git-svn-id: https://develop.svn.wordpress.org/trunk@21484 602fd350-edb4-49c9-b593-d223f7449a82
2012-08-09 13:17:14 +00:00
Andrew Ozz
90e990d983 When WP_Dependencies accept a string for a single dependency, make sure the string is not empty, see #20683
git-svn-id: https://develop.svn.wordpress.org/trunk@21481 602fd350-edb4-49c9-b593-d223f7449a82
2012-08-08 17:21:24 +00:00
Ryan Boren
4c0121178b Undeprecate *_blog_option() by popular demand. Put them back in ms-blogs.php since direct inclusion of ms-blogs.php/ms-functions.php is unforntunately common.
see #21432


git-svn-id: https://develop.svn.wordpress.org/trunk@21480 602fd350-edb4-49c9-b593-d223f7449a82
2012-08-08 17:11:15 +00:00
Andrew Nacin
5a45a59cb2 Declare, document, and protect $dbuser, $dbpassword, $dbname, $dbhost and $dbh in wpdb.
These properties, while protected, are still accessible thanks to the magic getter added in [21472].

props pento, nvartolomei, joelhardi. fixes #18510.



git-svn-id: https://develop.svn.wordpress.org/trunk@21473 602fd350-edb4-49c9-b593-d223f7449a82
2012-08-08 06:28:57 +00:00
Andrew Nacin
b3fb67a97d Lazy-load column info in wpdb. props pento. fixes #20838.
git-svn-id: https://develop.svn.wordpress.org/trunk@21472 602fd350-edb4-49c9-b593-d223f7449a82
2012-08-08 06:24:59 +00:00
Andrew Nacin
4218686707 Introduce wpdb::get_charset_collate() to return the DEFAULT CHARACTER SET and COLLATE for use in table schemas.
props simonwheatley, pento. fixes #18451.



git-svn-id: https://develop.svn.wordpress.org/trunk@21471 602fd350-edb4-49c9-b593-d223f7449a82
2012-08-08 06:13:48 +00:00
Andrew Nacin
aba535c65b Deprecate wpdb::supports_collation() in favor of wpdb::has_cap().
props hakre, pento. fixes #16757.



git-svn-id: https://develop.svn.wordpress.org/trunk@21470 602fd350-edb4-49c9-b593-d223f7449a82
2012-08-08 06:06:57 +00:00
Andrew Ozz
42b696ee44 Fix typo in wp_login_form(), props greenshady, fixes #21514
git-svn-id: https://develop.svn.wordpress.org/trunk@21469 602fd350-edb4-49c9-b593-d223f7449a82
2012-08-07 23:13:31 +00:00
Andrew Ozz
4e712ea44c TinyMCE: fix typo in button tooltips.
git-svn-id: https://develop.svn.wordpress.org/trunk@21468 602fd350-edb4-49c9-b593-d223f7449a82
2012-08-07 03:28:20 +00:00
bumpbot
142a33fd8e Compress scripts/styles: 3.5-alpha-21466.
git-svn-id: https://develop.svn.wordpress.org/trunk@21466 602fd350-edb4-49c9-b593-d223f7449a82
2012-08-06 22:58:30 +00:00
bumpbot
49ef671550 Compress scripts/styles: 3.5-alpha-21463.
git-svn-id: https://develop.svn.wordpress.org/trunk@21463 602fd350-edb4-49c9-b593-d223f7449a82
2012-08-06 20:58:37 +00:00
bumpbot
07a63e22e7 Compress scripts/styles: 3.5-alpha-21460.
git-svn-id: https://develop.svn.wordpress.org/trunk@21460 602fd350-edb4-49c9-b593-d223f7449a82
2012-08-06 18:58:29 +00:00
Andrew Ozz
cd8663f68d Replace last remaining gradients with css, standardize the gradient css cascade, props ocean90, fixes #16461
git-svn-id: https://develop.svn.wordpress.org/trunk@21459 602fd350-edb4-49c9-b593-d223f7449a82
2012-08-06 17:21:41 +00:00
bumpbot
9c0e7302fb Compress scripts/styles: 3.5-alpha-21458.
git-svn-id: https://develop.svn.wordpress.org/trunk@21458 602fd350-edb4-49c9-b593-d223f7449a82
2012-08-06 04:58:26 +00:00
bumpbot
b5864beaa0 Compress scripts/styles: 3.5-alpha-21456.
git-svn-id: https://develop.svn.wordpress.org/trunk@21456 602fd350-edb4-49c9-b593-d223f7449a82
2012-08-06 02:58:33 +00:00
bumpbot
add3a6f3ba Compress scripts/styles: 3.5-alpha-21453.
git-svn-id: https://develop.svn.wordpress.org/trunk@21453 602fd350-edb4-49c9-b593-d223f7449a82
2012-08-06 00:58:32 +00:00
Andrew Ozz
d80d9acc28 Accessibility: add off-screen Log Out link in the toolbar, tweak the class names of the accessible links in #adminbar, see #21312
git-svn-id: https://develop.svn.wordpress.org/trunk@21452 602fd350-edb4-49c9-b593-d223f7449a82
2012-08-06 00:34:44 +00:00
bumpbot
5273caf79f Compress scripts/styles: 3.5-alpha-21443.
git-svn-id: https://develop.svn.wordpress.org/trunk@21443 602fd350-edb4-49c9-b593-d223f7449a82
2012-08-05 22:58:29 +00:00
Andrew Ozz
96596da546 CSS cleanup: take out -moz-box-shadow, fixes #21482
git-svn-id: https://develop.svn.wordpress.org/trunk@21439 602fd350-edb4-49c9-b593-d223f7449a82
2012-08-05 22:41:49 +00:00
Andrew Ozz
d3a4604335 Accessibility: fix the Skip to content link, show it on :focus, improve the styling of the skip links when shown, see #21310, see #21471
git-svn-id: https://develop.svn.wordpress.org/trunk@21435 602fd350-edb4-49c9-b593-d223f7449a82
2012-08-05 21:37:57 +00:00
bumpbot
0f3bfa1172 Compress scripts/styles: 3.5-alpha-21429.
git-svn-id: https://develop.svn.wordpress.org/trunk@21429 602fd350-edb4-49c9-b593-d223f7449a82
2012-08-05 20:58:19 +00:00
Andrew Ozz
d5cdd76bde Accessibility: add text to the updates link in the toolbar, props SergeyBiryukov, fixes #21333
git-svn-id: https://develop.svn.wordpress.org/trunk@21425 602fd350-edb4-49c9-b593-d223f7449a82
2012-08-05 19:10:11 +00:00
bumpbot
0630d134d2 Compress scripts/styles: 3.5-alpha-21424.
git-svn-id: https://develop.svn.wordpress.org/trunk@21424 602fd350-edb4-49c9-b593-d223f7449a82
2012-08-05 18:58:19 +00:00
Andrew Ozz
b9892b6f4e Add "Skip to toolbar" accessibility shortcut, see #21471
git-svn-id: https://develop.svn.wordpress.org/trunk@21423 602fd350-edb4-49c9-b593-d223f7449a82
2012-08-05 18:41:52 +00:00
Dion Hulse
2c0adebab9 Fix the plupload script enqueue, props SergeyBiryukov, Fixes #21467. See #20683.
git-svn-id: https://develop.svn.wordpress.org/trunk@21421 602fd350-edb4-49c9-b593-d223f7449a82
2012-08-05 12:16:16 +00:00
Mark Jaquith
c2374d2d05 Let WP_Dependencies accept a string for a single dependency instead of requiring an array wrapper. props vhauri. fixes #20683
git-svn-id: https://develop.svn.wordpress.org/trunk@21420 602fd350-edb4-49c9-b593-d223f7449a82
2012-08-04 17:59:55 +00:00
bumpbot
03768ac6dd Compress scripts/styles: 3.5-alpha-21419.
git-svn-id: https://develop.svn.wordpress.org/trunk@21419 602fd350-edb4-49c9-b593-d223f7449a82
2012-08-03 22:58:18 +00:00
Andrew Ozz
79616fbb50 Quicktags: don't call the callback on pressing the access key when a button is not visible, see #21460
git-svn-id: https://develop.svn.wordpress.org/trunk@21418 602fd350-edb4-49c9-b593-d223f7449a82
2012-08-03 21:47:58 +00:00
Andrew Ozz
dbb09dee01 Add translation context for the Text editor tab name, props obenland, fixes #20993
git-svn-id: https://develop.svn.wordpress.org/trunk@21417 602fd350-edb4-49c9-b593-d223f7449a82
2012-08-03 21:08:52 +00:00
bumpbot
4e1bc64c80 Compress scripts/styles: 3.5-alpha-21416. TinyMCE updated.
git-svn-id: https://develop.svn.wordpress.org/trunk@21416 602fd350-edb4-49c9-b593-d223f7449a82
2012-08-03 18:58:19 +00:00
Andrew Ozz
ffab659fea TinyMCE: revert Firefox shortcuts to match all other browsers (Alt+Shift+letter), fix the labels for the shortcuts, update description in wp-mce-help, fixes #21197
git-svn-id: https://develop.svn.wordpress.org/trunk@21415 602fd350-edb4-49c9-b593-d223f7449a82
2012-08-03 18:12:45 +00:00
Ryan Boren
ce960f67a0 Deprecate get_blog_option(), add_blog_option(), update_blog_option(), and delete_blog_option().
Use the regular option functions wrapped in switch_to_blog() and restore_current_blog() instead.

Group multiple operations within a single switch where possible.

fixes #21432


git-svn-id: https://develop.svn.wordpress.org/trunk@21414 602fd350-edb4-49c9-b593-d223f7449a82
2012-08-03 17:51:42 +00:00
Andrew Nacin
a5c7405975 Move most instances of new WP_User to get_userdata(). see #21120.
git-svn-id: https://develop.svn.wordpress.org/trunk@21413 602fd350-edb4-49c9-b593-d223f7449a82
2012-08-03 01:06:05 +00:00
Ryan Boren
691425a3ff Introduce wp_cache_switch_to_blog() and WP_Object_Cache::switch_to_blog() as a lighter/faster way to switch the cache to a new blog id.
Add the blog id to the cache keys for multisite installs.

Use wp_cache_switch_to_blog() instead of wp_cache_init() in switch_to_blog().

Use wp_cache_switch_to_blog() instead of wp_cache_reset() in wp_start_object_cache().

Deprecate wp_cache_reset().

This avoids the many queries needed to re-prime the cache after switch_to_blog() on multisite installs using the default cache backend.

fixes #21434



git-svn-id: https://develop.svn.wordpress.org/trunk@21403 602fd350-edb4-49c9-b593-d223f7449a82
2012-08-02 18:31:14 +00:00
bumpbot
396adf6737 Compress scripts/styles: 3.5-alpha-21400.
git-svn-id: https://develop.svn.wordpress.org/trunk@21400 602fd350-edb4-49c9-b593-d223f7449a82
2012-08-01 22:58:25 +00:00
Peter Westwood
61abf077d0 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: https://develop.svn.wordpress.org/trunk@21387 602fd350-edb4-49c9-b593-d223f7449a82
2012-08-01 13:52:06 +00:00
Daryl Koopersmith
339f4deff6 Fix @since blocks... since we already released 3.4.1. see #21355.
git-svn-id: https://develop.svn.wordpress.org/trunk@21386 602fd350-edb4-49c9-b593-d223f7449a82
2012-08-01 07:20:44 +00:00
Daryl Koopersmith
0c84f28fb4 Add @since documentation, see #21355.
git-svn-id: https://develop.svn.wordpress.org/trunk@21385 602fd350-edb4-49c9-b593-d223f7449a82
2012-08-01 07:01:08 +00:00
bumpbot
1eebacb690 Compress scripts/styles: 3.5-alpha-21384.
git-svn-id: https://develop.svn.wordpress.org/trunk@21384 602fd350-edb4-49c9-b593-d223f7449a82
2012-08-01 06:58:20 +00:00
Daryl Koopersmith
bf458c2c1a Remove the ability to upload custom headers in the customizer. Properly handle selecting the correct first tab, and removing the control/section if no tabs exist. see #21355.
To check if the control has any potential tabs and headers, added:
* WP_Customize_Image_Control->prepare_control()
* WP_Customize_Header_Image_Control->prepare_control()
* WP_Customize_Header_Image_Control->default_headers
* WP_Customize_Header_Image_Control->uploaded_headers



git-svn-id: https://develop.svn.wordpress.org/trunk@21383 602fd350-edb4-49c9-b593-d223f7449a82
2012-08-01 06:45:54 +00:00
bumpbot
1f6ab35e33 Compress scripts/styles: 3.5-alpha-21382.
git-svn-id: https://develop.svn.wordpress.org/trunk@21382 602fd350-edb4-49c9-b593-d223f7449a82
2012-08-01 02:58:20 +00:00
Daryl Koopersmith
2439e4d722 Pinking shears.
git-svn-id: https://develop.svn.wordpress.org/trunk@21381 602fd350-edb4-49c9-b593-d223f7449a82
2012-08-01 02:30:02 +00:00
Daryl Koopersmith
a1513dd683 When the browser property is not provided to wp.Uploader, hide Plupload's auto-created file input and call Plupload's disableBrowse. see #21437, [21379].
git-svn-id: https://develop.svn.wordpress.org/trunk@21380 602fd350-edb4-49c9-b593-d223f7449a82
2012-08-01 02:27:18 +00:00
Daryl Koopersmith
75f9258969 Make the browser property in wp.Uploader optional. fixes #21437.
git-svn-id: https://develop.svn.wordpress.org/trunk@21379 602fd350-edb4-49c9-b593-d223f7449a82
2012-08-01 01:10:13 +00:00
Ryan Boren
43d668a041 Use Yoda conditions. Props evansolomon. see #21270
git-svn-id: https://develop.svn.wordpress.org/trunk@21378 602fd350-edb4-49c9-b593-d223f7449a82
2012-07-31 21:11:17 +00:00
Andrew Nacin
d69dda48ec Use get_userdata() rather than new WP_User in is_super_admin(), to take advantage of the performance improvements in [21376]. see #21120.
git-svn-id: https://develop.svn.wordpress.org/trunk@21377 602fd350-edb4-49c9-b593-d223f7449a82
2012-07-31 17:47:08 +00:00
Andrew Nacin
2c058d3b3a Optimize get_user_by( 'id', $id ) to return wp_get_current_user() when the current user ID is requested.
Provides for a major performance improvement by preventing repeated instantiations of WP_User in the capabilities API.

see #21120.



git-svn-id: https://develop.svn.wordpress.org/trunk@21376 602fd350-edb4-49c9-b593-d223f7449a82
2012-07-31 17:45:38 +00:00
Andrew Nacin
cd7e3f097d Don't call get_userdata() every time for the current user in map_meta_cap()'s read_post, edit_post, and delete_post branches. see #21120.
git-svn-id: https://develop.svn.wordpress.org/trunk@21375 602fd350-edb4-49c9-b593-d223f7449a82
2012-07-31 17:39:14 +00:00
Ryan Boren
4bdd2ed253 Better phpdoc for user_nicename. Props SergeyBiryukov. fixes #21427
git-svn-id: https://develop.svn.wordpress.org/trunk@21374 602fd350-edb4-49c9-b593-d223f7449a82
2012-07-31 15:50:29 +00:00