Commit Graph

10388 Commits

Author SHA1 Message Date
Andrew Nacin 1c0611a1df Use ABSPATH . WPINC rather than dynamically building the include path. see #21183.
git-svn-id: http://core.svn.wordpress.org/trunk@21645 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-28 17:27:18 +00:00
Andrew Nacin 405a995659 Update to SimplePie 1.3. props rmccue.
Uses individual files for each class. We now conditionally load only the pieces
we need, resulting in less memory usage. Also easier to maintain now that it is
not a single 387KB file.

fixes #21183.



git-svn-id: http://core.svn.wordpress.org/trunk@21644 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-28 17:24:33 +00:00
Andrew Ozz 3980c183a1 More visible :focus style for form elements, props lessbloat, see #21324
git-svn-id: http://core.svn.wordpress.org/trunk@21641 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-28 05:48:58 +00:00
Andrew Nacin 7ec559fe8a Update Jcrop to 0.9.10. Includes touch support. fixes #20728.
git-svn-id: http://core.svn.wordpress.org/trunk@21633 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-27 23:37:03 +00:00
Andrew Nacin 1af0737e0f Update jQuery Color Animations plugin to 2.1.0. Props gnarf. fixes #21692.
git-svn-id: http://core.svn.wordpress.org/trunk@21632 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-27 23:27:14 +00:00
Daryl Koopersmith 0015503c26 Allow elements within a wp.Uploader dropzone to be repositioned when the drag-over class is added. fixes #21705.
git-svn-id: http://core.svn.wordpress.org/trunk@21630 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-27 22:20:23 +00:00
Ryan Boren 446be3ee40 Use set_url_scheme() in _custom_background_cb() to properly set the scheme for the background image when is_ssl(). Props jkudish. fixes #18005
git-svn-id: http://core.svn.wordpress.org/trunk@21629 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-27 20:25:53 +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
Ryan Boren af91b41af3 Return WP_Post from get_adjacent_post(). see #21309
git-svn-id: http://core.svn.wordpress.org/trunk@21627 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-27 13:13:40 +00:00
Andrew Nacin d1b5eca1a5 Add 'order' to wp_get_archives(). props tar.gz. fixes #18832.
git-svn-id: http://core.svn.wordpress.org/trunk@21610 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-24 20:50:22 +00:00
Andrew Nacin e225c12704 Basic support for the mysql_connect() new_link and client_flags arguments. props Otto42, fixes #19324.
git-svn-id: http://core.svn.wordpress.org/trunk@21609 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-24 17:44:21 +00:00
Andrew Nacin 1d46178afd Remove the @return for WP_Admin_Bar::remove_node(). props scribu. fixes #20906.
git-svn-id: http://core.svn.wordpress.org/trunk@21608 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-24 17:34:52 +00:00
Ryan Boren 0352820e7b Remove typo in phpdoc. see #21309 Props TobiasBg
git-svn-id: http://core.svn.wordpress.org/trunk@21601 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-23 21:15:40 +00:00
Ryan Boren bd94583aaf Use get_post() instead of bare SQL in do_trackbacks(). see #21309
git-svn-id: http://core.svn.wordpress.org/trunk@21599 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-23 20:43:47 +00:00
Ryan Boren 18a1783423 Update phpdoc for functions that return WP_Post. Soft deprecate get_page(). see #21309
git-svn-id: http://core.svn.wordpress.org/trunk@21598 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-23 20:34:41 +00:00
Ryan Boren f56d8278bb Remove return ref from all calls to get_post()
Return WP_Post from get_default_post_to_edit()
Replace all calls to get_page() with get_post()
see #21309


git-svn-id: http://core.svn.wordpress.org/trunk@21597 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-23 20:01:10 +00:00
Ryan Boren 6248d6221c Don't overwrite the post global in _get_page_link(). see #21309
git-svn-id: http://core.svn.wordpress.org/trunk@21596 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-23 19:28:58 +00:00
Ryan Boren 1c44b15e63 Restore blog_option_* filter. see #21459
git-svn-id: http://core.svn.wordpress.org/trunk@21595 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-23 16:04:39 +00:00
Andrew Nacin aec38ee1af Remove Prototype and script.aculo.us from core.
Continue to register them, pulling from ajax.googleapis.com. This is only being done for backwards compatibility;
libraries in use will continue to be local sources.

In the process, update to the latest versions of Prototype (1.7.1, June 5) and script.aculo.us (1.9.0, from 2010).

props helenyhou.
fixes #21661, #16664, #16665.



git-svn-id: http://core.svn.wordpress.org/trunk@21593 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-23 00:51:08 +00:00
Andrew Nacin 2710bcade1 Switch to .min for compressed JS and CSS files.
* This moves our "development" versions from .dev.js to .js (same for css).
 * The compressed version then moves from .js to .min.js (same for css).

By switching to the standard .min convention, it sets expectations for developers,
and works nicely with existing tools such as ack.

fixes #21633.



git-svn-id: http://core.svn.wordpress.org/trunk@21592 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-23 00:04:18 +00:00
Daryl Koopersmith 5bf22749a3 Please welcome Underscore.js and Backbone.js to core. fixes #21664.
git-svn-id: http://core.svn.wordpress.org/trunk@21591 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-22 22:24:20 +00:00
Ryan Boren d7f724070e jQuery 1.8.0 and jQuery UI 1.8.23. Props c3mdigital. see #21532
git-svn-id: http://core.svn.wordpress.org/trunk@21590 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-22 21:20:15 +00:00
Bot (Assets) 975b727abd Compress scripts/styles: 3.5-alpha-21589.
git-svn-id: http://core.svn.wordpress.org/trunk@21589 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-22 20:58:31 +00:00
Bot (Assets) 245cb4acba Compress scripts/styles: 3.5-alpha-21587.
git-svn-id: http://core.svn.wordpress.org/trunk@21587 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-22 18:58:32 +00:00
Andrew Ozz 82d27641a5 Fix tabbing from the title to the editor on the Edit Post screen, see #21173
git-svn-id: http://core.svn.wordpress.org/trunk@21586 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-22 18:29:42 +00:00
Ryan Boren 7515511dd9 Use get_posts() to fetch stickies rather than custom bare SQL. Props scribu. see #21309
git-svn-id: http://core.svn.wordpress.org/trunk@21585 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-22 18:24:23 +00:00
Bot (Assets) 4f587a0515 Compress scripts/styles: 3.5-alpha-21583.
git-svn-id: http://core.svn.wordpress.org/trunk@21583 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-22 16:58:25 +00:00
Ryan Boren f11317881a Resurrect the switched global. Some are still using it. see #21459
git-svn-id: http://core.svn.wordpress.org/trunk@21581 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-22 03:34:00 +00:00
Bot (Assets) 4ce88d3d0f Compress scripts/styles: 3.5-alpha-21580. TinyMCE updated.
git-svn-id: http://core.svn.wordpress.org/trunk@21580 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-22 02:58:28 +00:00
Andrew Ozz d2f6b4559f Disable the (fake) image resizing in WebKit and Opera in TinyMCE 3.5.6, fix dragging image with caption in Firefox, see #21173
git-svn-id: http://core.svn.wordpress.org/trunk@21576 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-22 01:47:53 +00:00
Bot (Assets) 9bd7b4811b Compress scripts/styles: 3.5-alpha-21575.
git-svn-id: http://core.svn.wordpress.org/trunk@21575 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-21 22:58:27 +00:00
Ryan Boren d2ecd62b7f Remove references from get_post() and get_page().
Handle $GLOBALS['post'] containing stdClass instead of WP_Post.
Props nacin
see #21309


git-svn-id: http://core.svn.wordpress.org/trunk@21572 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-21 15:42:28 +00:00
Peter Westwood 791eda2594 When comment paging is enabled make sure to have canonical links for each of the comment pages so that all the comments are indexed instead of just the ones that are displayed on the permalink itself.
Fixes #21579 props jkudish.


git-svn-id: http://core.svn.wordpress.org/trunk@21571 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-21 12:53:54 +00:00
Peter Westwood a8ce9af6d8 Comments: Allow the caller of get_comments() to request comments with a specific comment_approved value.
This allows for a custom comment status to be queried directly overriding the status argument.

See #21101 props nbachiyski.


git-svn-id: http://core.svn.wordpress.org/trunk@21570 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-21 09:56:16 +00:00
Andrew Nacin d65b2caac9 Ensure sticky posts are WP_Post objects. props mdawaffe. see #21309.
git-svn-id: http://core.svn.wordpress.org/trunk@21569 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-21 04:04:54 +00:00
Andrew Nacin 80159bda68 Restore _get_post_ancestors() in deprecated.php to prevent fatal errors. see #21309.
git-svn-id: http://core.svn.wordpress.org/trunk@21568 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-21 00:10:05 +00:00
Andrew Nacin cc63fad8cb Return a variable reference from get_pages(). see [21559], see #21309, fixes #20756.
git-svn-id: http://core.svn.wordpress.org/trunk@21567 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-20 23:43:04 +00:00
Andrew Nacin 46eb6f0c26 Move the optimization done to get_user_by() in [21376] higher up the stack, into map_meta_cap() and is_super_admin().
This provides nearly the same benefits without possibly receiving a stale object from get_userdata(),
which could affect authentication, and introduce side effects for plugins.

see #21120.



git-svn-id: http://core.svn.wordpress.org/trunk@21563 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-20 21:58:34 +00:00
Ryan Boren 9cf4306b6d s/is_ms_switched/ms_is_switched/ see #21459
git-svn-id: http://core.svn.wordpress.org/trunk@21561 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-20 20:56:34 +00:00
Ryan Boren 21782ca444 Introduce is_ms_switched(). see #21459
git-svn-id: http://core.svn.wordpress.org/trunk@21560 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-20 20:48:35 +00:00
Ryan Boren 9377523bce Introduce WP_Post class. Clean up ancestors handling. Props scribu, toppa. fixes #10381 see #21309
git-svn-id: http://core.svn.wordpress.org/trunk@21559 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-20 19:47:52 +00:00
Ryan Boren 9dbb6a34f6 Reduce calls to sanitize_title_with_dashes in register_(post_type|taxonomy). Props ocean90. fixes #21600
git-svn-id: http://core.svn.wordpress.org/trunk@21553 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-20 17:25:06 +00:00
Andrew Nacin 9eeccc2230 Add term_taxonomy_id field handling to WP_Tax_Query::transform_query(), allowing the transformation to be bypassed when tt ids are passed.
props wonderboymusic.
fixes #21228.



git-svn-id: http://core.svn.wordpress.org/trunk@21552 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-20 16:49:21 +00:00
Andrew Nacin bfaaa3d8ab Remove unused multisite option 'language'. props wonderboymusic. fixes #21545.
git-svn-id: http://core.svn.wordpress.org/trunk@21551 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-20 16:43:44 +00:00
Andrew Nacin 7a4fdb78e1 Always return a variable reference from get_pages(). props wonderboymusic, foxinni. fixes #20756.
git-svn-id: http://core.svn.wordpress.org/trunk@21550 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-20 16:38:43 +00:00
Andrew Ozz 39ab1e4535 Fix screen reader text in IE7 and 8 in the toolbar "Updates" menu, props SergeyBiryukov, fixes #21333
git-svn-id: http://core.svn.wordpress.org/trunk@21549 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-19 22:19:00 +00:00
Bot (Assets) 4313374dad Compress scripts/styles: 3.5-alpha-21548.
git-svn-id: http://core.svn.wordpress.org/trunk@21548 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-19 18:58:22 +00:00
Bot (Assets) e1a28534d0 Compress scripts/styles: 3.5-alpha-21546. TinyMCE updated.
git-svn-id: http://core.svn.wordpress.org/trunk@21546 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-19 00:58:19 +00:00
Andrew Ozz b35ac4a005 Update TinyMCE to 3.5.6, see #21173
git-svn-id: http://core.svn.wordpress.org/trunk@21545 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-18 23:24:27 +00:00
Ryan Boren 02dc348b57 Introduce wp_get_mime_types() for fetching the complete list of mime types. Remove the static caching of the types so that filters other than the first filter work. Use wp_get_mime_types() in do_enclose(). fixes #21299 #21594
git-svn-id: http://core.svn.wordpress.org/trunk@21541 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-17 17:25:19 +00:00
Andrew Nacin 7109699941 If the DB upgrade hasn't yet been run, assume the Link Manager is disabled. Important for multisite installs. props ryan. see #21307.
git-svn-id: http://core.svn.wordpress.org/trunk@21537 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-16 23:09:40 +00:00
Bot (Assets) 95e5cafc63 Compress scripts/styles: 3.5-alpha-21535.
git-svn-id: http://core.svn.wordpress.org/trunk@21535 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-16 16:58:26 +00:00
Andrew Ozz 90679de970 Revert [21495]. Discussed in dev-chat: it's better if the themes implement this or something similar.
git-svn-id: http://core.svn.wordpress.org/trunk@21532 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-15 21:21:51 +00:00
Ryan Boren cb64a77217 Specify the encoding in IXR_Server::output(). Props solarissmoke, sergey.s.betke@novgaro.ru, SergeyBiryukov. fixes #4794
git-svn-id: http://core.svn.wordpress.org/trunk@21531 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-15 20:12:00 +00:00
Bot (Assets) b104249ef2 Compress scripts/styles: 3.5-alpha-21530.
git-svn-id: http://core.svn.wordpress.org/trunk@21530 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-15 18:58:27 +00:00
Ryan Boren c1b270d95a Specify the charset in WP_Ajax_Response::send(). Props sergey.s.betke@novgaro.ru, SergeyBiryukov. fixes #19448
git-svn-id: http://core.svn.wordpress.org/trunk@21528 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-15 18:17:21 +00:00
Ryan Boren 2394b77094 Fix MS Office mime types. Group the mime list in get_allowed_mime_types() by type. Props hebbet, markel, SergeyBiryukov. fixes #17117
git-svn-id: http://core.svn.wordpress.org/trunk@21527 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-15 16:48:36 +00:00
Ryan Boren 489924938f Return post_parent, menu_order, guid, and post_mime_type from wp.getPost(). Props maxcutler. fixes #21308
git-svn-id: http://core.svn.wordpress.org/trunk@21526 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-15 16:06:05 +00:00
Ryan Boren 411714ad68 Fix phpdoc for switch_to_blog() and restore_current_blog(). Props SergeyBiryukov. fixes #21459
git-svn-id: http://core.svn.wordpress.org/trunk@21523 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-15 15:56:14 +00:00
Ryan Boren 5f8ae64dd6 Add @since for _wp_get_user_contactmethods() and _get_additional_user_keys(). Props SergeyBiryukov. fixes #21246
git-svn-id: http://core.svn.wordpress.org/trunk@21522 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-15 15:33:59 +00:00
Ryan Boren 7342291b01 Update @since for various wpdb properties. Props SergeyBiryukov. fixes #21582
git-svn-id: http://core.svn.wordpress.org/trunk@21521 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-15 15:32:35 +00:00
Bot (Assets) 29621a23ad Compress scripts/styles: 3.5-alpha-21514.
git-svn-id: http://core.svn.wordpress.org/trunk@21514 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-14 20:58:23 +00:00
Andrew Nacin 2b21b814a1 @since for wpdb's result property. props SergeyBiryukov. see #21533.
git-svn-id: http://core.svn.wordpress.org/trunk@21513 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-14 20:34:12 +00:00
Andrew Nacin f965d758fc Add magic set, isset, and unset to wpdb. props pento.
These magic methods allow us to mark properties as protected or private, without breaking compatibility, as they were once accessible. The joys of PHP4.

fixes #18510.



git-svn-id: http://core.svn.wordpress.org/trunk@21512 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-14 20:26:04 +00:00
Andrew Nacin c11a4c09e8 Eliminate error suppression for mysql_free_result() and only call it when the result is actually a resource. Depending on the query, mysql_query() can return a boolean rather than a resource, hence the original use of error suppression.
Fixes a warning introduced in [21472] when calling mysql_free_result() was moved to flush().

fixes #20838.



git-svn-id: http://core.svn.wordpress.org/trunk@21511 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-14 20:21:10 +00:00
Ryan Boren 17f544b798 Update wp_update_user() phpdoc to reflect a possible return of WP_Error. Props SergeyBiryukov. fixes #21439
git-svn-id: http://core.svn.wordpress.org/trunk@21509 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-14 19:29:40 +00:00
Ryan Boren dc58551658 Add isset() check to avoid notice. Props c3mdigital. fixes #21512
git-svn-id: http://core.svn.wordpress.org/trunk@21506 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-14 19:07:56 +00:00
Bot (Assets) a84e9aebfd Compress scripts/styles: 3.5-alpha-21505.
git-svn-id: http://core.svn.wordpress.org/trunk@21505 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-14 18:58:20 +00:00
Ryan Boren 15dd7f70b0 Remove post type from post nonces. Fixes attachment deletion when EMPTY_TRASH_DAYS is 0. Props c3mdigital, kurtpayne, SergeyBiryukov. fixes #21194
git-svn-id: http://core.svn.wordpress.org/trunk@21504 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-14 18:39:15 +00:00
Andrew Nacin 4d014c4f40 Fix WP_Theme's get_template_directory_uri() method. props batmoo. see #21549 for trunk.
git-svn-id: http://core.svn.wordpress.org/trunk@21503 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-14 18:38:26 +00:00
Andrew Nacin 84c3a86036 Hide the link manager from the UI on upgrade, if the site has no links. New DB option, link_manager_enabled.
Enforce this by denying the 'manage_links' capability, which hides the All Links, Add New Link, and Link Categories screens. Hide WP_Widget_Links and the UI for the default_link_category as well.

Convert all references to 'posts and links' when handling reassignment on user deletion to just 'posts'.

see #21307.



git-svn-id: http://core.svn.wordpress.org/trunk@21501 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-13 16:18:42 +00:00
Bot (Assets) 0802777be2 Compress scripts/styles: 3.5-alpha-21499.
git-svn-id: http://core.svn.wordpress.org/trunk@21499 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-11 02:58:19 +00:00
Andrew Ozz 64033c4645 Remove unused images, props helenyhou, coffee2code, ocean90, fixes #20980
git-svn-id: http://core.svn.wordpress.org/trunk@21498 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-11 02:36:01 +00:00
Ryan Boren 1fd3c5471e Avoid fatal error in the customizer when the current theme doesn't support custom headers. Props c3mdigital. fixes #21515
git-svn-id: http://core.svn.wordpress.org/trunk@21497 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-10 20:15:06 +00:00
Ryan Boren cbd6a8becd Allow passing stdClass and WP_User to wp_insert_user() and wp_update_user(). Introduce WP_User::to_array(). Eliminate uses of get_object_vars() when passing to wp_*_user(). fixes #21429
git-svn-id: http://core.svn.wordpress.org/trunk@21496 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-10 15:36:54 +00:00
Andrew Ozz ed1698e29b Better editor background, take one, see #21536
git-svn-id: http://core.svn.wordpress.org/trunk@21495 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-10 07:11:03 +00:00
ryan d286875515 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: http://core.svn.wordpress.org/trunk@21485 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-09 16:28:15 +00:00
ryan 14ecba530b Move get_current_blog_id() to load.php so it is available during multisite bootstrap. fixes #21432
git-svn-id: http://core.svn.wordpress.org/trunk@21484 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-09 13:17:14 +00:00
azaozz cbc9aabfa4 When WP_Dependencies accept a string for a single dependency, make sure the string is not empty, see #20683
git-svn-id: http://core.svn.wordpress.org/trunk@21481 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-08 17:21:24 +00:00
ryan 87dc511c0f 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: http://core.svn.wordpress.org/trunk@21480 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-08 17:11:15 +00:00
nacin f02bacd9f1 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: http://core.svn.wordpress.org/trunk@21473 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-08 06:28:57 +00:00
nacin 1425762319 Lazy-load column info in wpdb. props pento. fixes #20838.
git-svn-id: http://core.svn.wordpress.org/trunk@21472 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-08 06:24:59 +00:00
nacin 4e5fd4de46 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: http://core.svn.wordpress.org/trunk@21471 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-08 06:13:48 +00:00
nacin 73c74cf8f7 Deprecate wpdb::supports_collation() in favor of wpdb::has_cap().
props hakre, pento. fixes #16757.



git-svn-id: http://core.svn.wordpress.org/trunk@21470 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-08 06:06:57 +00:00
azaozz 7de126df1f Fix typo in wp_login_form(), props greenshady, fixes #21514
git-svn-id: http://core.svn.wordpress.org/trunk@21469 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-07 23:13:31 +00:00
azaozz cb618f5858 TinyMCE: fix typo in button tooltips.
git-svn-id: http://core.svn.wordpress.org/trunk@21468 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-07 03:28:20 +00:00
bumpbot e27c374cf0 Compress scripts/styles: 3.5-alpha-21466.
git-svn-id: http://core.svn.wordpress.org/trunk@21466 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-06 22:58:30 +00:00
bumpbot 704304d6fe Compress scripts/styles: 3.5-alpha-21463.
git-svn-id: http://core.svn.wordpress.org/trunk@21463 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-06 20:58:37 +00:00
bumpbot cbacfc849c Compress scripts/styles: 3.5-alpha-21460.
git-svn-id: http://core.svn.wordpress.org/trunk@21460 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-06 18:58:29 +00:00
azaozz 853df37fe8 Replace last remaining gradients with css, standardize the gradient css cascade, props ocean90, fixes #16461
git-svn-id: http://core.svn.wordpress.org/trunk@21459 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-06 17:21:41 +00:00
bumpbot 59eb150fdc Compress scripts/styles: 3.5-alpha-21458.
git-svn-id: http://core.svn.wordpress.org/trunk@21458 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-06 04:58:26 +00:00
bumpbot 6ce8c8872b Compress scripts/styles: 3.5-alpha-21456.
git-svn-id: http://core.svn.wordpress.org/trunk@21456 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-06 02:58:33 +00:00
bumpbot f8ce3f7163 Compress scripts/styles: 3.5-alpha-21453.
git-svn-id: http://core.svn.wordpress.org/trunk@21453 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-06 00:58:32 +00:00
azaozz 4ef4df2f3e 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: http://core.svn.wordpress.org/trunk@21452 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-06 00:34:44 +00:00
bumpbot fc62ad5e57 Compress scripts/styles: 3.5-alpha-21443.
git-svn-id: http://core.svn.wordpress.org/trunk@21443 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-05 22:58:29 +00:00
azaozz 83d04bb82a CSS cleanup: take out -moz-box-shadow, fixes #21482
git-svn-id: http://core.svn.wordpress.org/trunk@21439 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-05 22:41:49 +00:00
azaozz c368f0e6a1 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: http://core.svn.wordpress.org/trunk@21435 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-05 21:37:57 +00:00
bumpbot bb04145462 Compress scripts/styles: 3.5-alpha-21429.
git-svn-id: http://core.svn.wordpress.org/trunk@21429 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-05 20:58:19 +00:00
azaozz 30dd9b1aa6 Accessibility: add text to the updates link in the toolbar, props SergeyBiryukov, fixes #21333
git-svn-id: http://core.svn.wordpress.org/trunk@21425 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-05 19:10:11 +00:00
bumpbot e2c2d70548 Compress scripts/styles: 3.5-alpha-21424.
git-svn-id: http://core.svn.wordpress.org/trunk@21424 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-05 18:58:19 +00:00
azaozz 6bf5d66d5b Add "Skip to toolbar" accessibility shortcut, see #21471
git-svn-id: http://core.svn.wordpress.org/trunk@21423 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-05 18:41:52 +00:00
dd32 5c59400d74 Fix the plupload script enqueue, props SergeyBiryukov, Fixes #21467. See #20683.
git-svn-id: http://core.svn.wordpress.org/trunk@21421 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-05 12:16:16 +00:00
markjaquith eedce37675 Let WP_Dependencies accept a string for a single dependency instead of requiring an array wrapper. props vhauri. fixes #20683
git-svn-id: http://core.svn.wordpress.org/trunk@21420 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-04 17:59:55 +00:00
bumpbot 81286bad53 Compress scripts/styles: 3.5-alpha-21419.
git-svn-id: http://core.svn.wordpress.org/trunk@21419 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-03 22:58:18 +00:00
azaozz 3fc7495aca Quicktags: don't call the callback on pressing the access key when a button is not visible, see #21460
git-svn-id: http://core.svn.wordpress.org/trunk@21418 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-03 21:47:58 +00:00
azaozz 49c29501ef Add translation context for the Text editor tab name, props obenland, fixes #20993
git-svn-id: http://core.svn.wordpress.org/trunk@21417 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-03 21:08:52 +00:00
bumpbot fce47c7cef Compress scripts/styles: 3.5-alpha-21416. TinyMCE updated.
git-svn-id: http://core.svn.wordpress.org/trunk@21416 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-03 18:58:19 +00:00
azaozz f56f339aaf 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: http://core.svn.wordpress.org/trunk@21415 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-03 18:12:45 +00:00
ryan 5ca54e7d2f 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: http://core.svn.wordpress.org/trunk@21414 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-03 17:51:42 +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
ryan 295ca4d76f 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: http://core.svn.wordpress.org/trunk@21403 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-02 18:31:14 +00:00
bumpbot 606c472881 Compress scripts/styles: 3.5-alpha-21400.
git-svn-id: http://core.svn.wordpress.org/trunk@21400 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-01 22:58:25 +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
koopersmith 29f2b5b903 Fix @since blocks... since we already released 3.4.1. see #21355.
git-svn-id: http://core.svn.wordpress.org/trunk@21386 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-01 07:20:44 +00:00
koopersmith eb7e421d69 Add @since documentation, see #21355.
git-svn-id: http://core.svn.wordpress.org/trunk@21385 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-01 07:01:08 +00:00
bumpbot 506492de67 Compress scripts/styles: 3.5-alpha-21384.
git-svn-id: http://core.svn.wordpress.org/trunk@21384 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-01 06:58:20 +00:00
koopersmith 86b352faea 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: http://core.svn.wordpress.org/trunk@21383 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-01 06:45:54 +00:00
bumpbot 50b0511449 Compress scripts/styles: 3.5-alpha-21382.
git-svn-id: http://core.svn.wordpress.org/trunk@21382 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-01 02:58:20 +00:00
koopersmith 21d1ea5f85 Pinking shears.
git-svn-id: http://core.svn.wordpress.org/trunk@21381 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-01 02:30:02 +00:00
koopersmith b779aff50a 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: http://core.svn.wordpress.org/trunk@21380 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-01 02:27:18 +00:00
koopersmith 83f2d7dc6e Make the browser property in wp.Uploader optional. fixes #21437.
git-svn-id: http://core.svn.wordpress.org/trunk@21379 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-01 01:10:13 +00:00
ryan af18fc1ae2 Use Yoda conditions. Props evansolomon. see #21270
git-svn-id: http://core.svn.wordpress.org/trunk@21378 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-07-31 21:11:17 +00:00
nacin fed9492cbc 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: http://core.svn.wordpress.org/trunk@21377 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-07-31 17:47:08 +00:00
nacin 174dad02bc 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: http://core.svn.wordpress.org/trunk@21376 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-07-31 17:45:38 +00:00
nacin fcae3978c3 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: http://core.svn.wordpress.org/trunk@21375 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-07-31 17:39:14 +00:00
ryan 996366cc0e Better phpdoc for user_nicename. Props SergeyBiryukov. fixes #21427
git-svn-id: http://core.svn.wordpress.org/trunk@21374 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-07-31 15:50:29 +00:00
ryan 4630ae82ce Call func_get_args() once in add_query_arg(). Props SergeyBiryukov. see #21332
git-svn-id: http://core.svn.wordpress.org/trunk@21373 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-07-31 15:28:10 +00:00
azaozz d77372ea76 TinyMCE: better exclusion of Opera mobile, fixes #21416
git-svn-id: http://core.svn.wordpress.org/trunk@21367 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-07-30 19:40:52 +00:00
ryan 7b49ad8493 Introduce get_edit_user_link(). Props scribu, georgestephanis, johnbillion. fixes #14787 see #20307
git-svn-id: http://core.svn.wordpress.org/trunk@21364 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-07-30 18:30:03 +00:00
ryan 09d728e46b Take the mmm out of comment_ID. Just mm is sufficient.
Props wonderboymusic
fixes #21400


git-svn-id: http://core.svn.wordpress.org/trunk@21363 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-07-30 16:16:13 +00:00
azaozz 4ca78e553d TinyMCE: don't load in Opera Mobile as it doesn't support contentEditable yet, fixes #21416
git-svn-id: http://core.svn.wordpress.org/trunk@21361 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-07-30 00:14:43 +00:00
bumpbot 67ac9ee9a1 Compress scripts/styles: 3.5-alpha-21360. TinyMCE updated.
git-svn-id: http://core.svn.wordpress.org/trunk@21360 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-07-29 22:58:19 +00:00
azaozz 8dfdf4565a TinyMCE shortcuts: revert to Alt + Shift + letter for WebKit and Ctrl + Alt + letter (Command + Option + letter) in Firefox, see #21197
git-svn-id: http://core.svn.wordpress.org/trunk@21359 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-07-29 21:08:58 +00:00
ryan e75d8f7d9e Refactor *_blog_option() functions to use switch_to_blog(), restore_current_blog(), and the *_option() functions. Do not use site-options for blog option caching as this duplicated info and did not properly invalidate.
Props jeremyfelt
fixes #21270


git-svn-id: http://core.svn.wordpress.org/trunk@21357 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-07-27 14:57:32 +00:00
ryan 564a7db2cb phpdoc for Customizer classes and methods. Props bananastalktome. see #21303
git-svn-id: http://core.svn.wordpress.org/trunk@21354 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-07-26 21:45:33 +00:00
ryan c390c3afb0 Introduce wp_oembed_remove_provider(). Props r-a-y. fixes #16327
git-svn-id: http://core.svn.wordpress.org/trunk@21351 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-07-26 20:18:27 +00:00
bumpbot 020cb0fd5a Compress scripts/styles: 3.5-alpha-21348.
git-svn-id: http://core.svn.wordpress.org/trunk@21348 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-07-25 22:58:21 +00:00
azaozz 523ae5d425 Update ImgAreaSelect to 0.9.9 that fixes IE7 stack overflow error, props c3mdigital, fixes #21363, fixes #21348 for trunk
git-svn-id: http://core.svn.wordpress.org/trunk@21347 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-07-25 22:43:04 +00:00
azaozz d4e0c684d3 Bail out themes and plugins that have copied code from core and don't maintain it by requiring class-wp-editor.php in wp-langs.php, fixes #21350 for trunk
git-svn-id: http://core.svn.wordpress.org/trunk@21345 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-07-25 19:59:29 +00:00
bumpbot 0d4970e928 Compress scripts/styles: 3.5-alpha-21338.
git-svn-id: http://core.svn.wordpress.org/trunk@21339 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-07-25 18:58:20 +00:00
azaozz dcf3b84ebb Reset text-indent on the toolbar, props mfields, fixes #21362
git-svn-id: http://core.svn.wordpress.org/trunk@21335 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-07-25 18:38:16 +00:00
ryan fdae8f9b42 Fix some spelling errors. Props thee17. fixes #21191
git-svn-id: http://core.svn.wordpress.org/trunk@21333 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-07-25 18:06:13 +00:00
ryan 29e6ade734 Use get_search_query() in feed-rss2-comments.php. Props SergeyBiryukov. fixes #21365
git-svn-id: http://core.svn.wordpress.org/trunk@21332 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-07-25 18:04:17 +00:00
ryan 50fc51d8d2 Don't attempt to define the COMMENTS_TEMPLATE constant twice. Props kitchin. fixes #21337
git-svn-id: http://core.svn.wordpress.org/trunk@21330 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-07-25 17:54:35 +00:00
ryan ef95736bce Set the global comment var before invoking callbacks in wp_list_comments(). Props sirzooro. fixes #21184
git-svn-id: http://core.svn.wordpress.org/trunk@21324 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-07-25 16:27:48 +00:00
bumpbot 6c82674ea0 Compress scripts/styles: 3.5-alpha-21321.
git-svn-id: http://core.svn.wordpress.org/trunk@21321 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-07-25 06:58:20 +00:00
azaozz 883114f813 RTL css for the spinner in internal linking, see #21351
git-svn-id: http://core.svn.wordpress.org/trunk@21320 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-07-25 05:15:26 +00:00
azaozz e844940922 Put the spinner back to the right of the search field in internal linking, fixes #21351
git-svn-id: http://core.svn.wordpress.org/trunk@21319 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-07-25 04:41:18 +00:00
bumpbot ab56412645 Compress scripts/styles: 3.5-alpha-21314.
git-svn-id: http://core.svn.wordpress.org/trunk@21314 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-07-24 02:58:23 +00:00
bumpbot 8167046e99 Compress scripts/styles: 3.5-alpha-21312.
git-svn-id: http://core.svn.wordpress.org/trunk@21312 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-07-24 00:58:22 +00:00