sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
28,453 Commits 2 Branches 473 Tags 137 MiB
9189fbcff9
Commit Graph

28453 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrew Ozz
45f4403dd0 TinyMCE: update to 4.1.7, changelog: https://github.com/tinymce/tinymce/blob/master/changelog.txt. Fixes #30560. 
git-svn-id: https://develop.svn.wordpress.org/trunk@30675 602fd350-edb4-49c9-b593-d223f7449a82
 2014-11-30 23:27:23 +00:00
Scott Taylor
0632a3de68 Improve various @param docs. 
See #30224.


git-svn-id: https://develop.svn.wordpress.org/trunk@30674 602fd350-edb4-49c9-b593-d223f7449a82
 2014-11-30 23:23:37 +00:00
Scott Taylor
ee388b9852 Improve various @param docs. 
See #30224.


git-svn-id: https://develop.svn.wordpress.org/trunk@30673 602fd350-edb4-49c9-b593-d223f7449a82
 2014-11-30 22:55:08 +00:00
Scott Taylor
6bb2a4ce36 Improve the @param docs for src/includes/theme.php and src/includes/update.php. 
See #30224.


git-svn-id: https://develop.svn.wordpress.org/trunk@30672 602fd350-edb4-49c9-b593-d223f7449a82
 2014-11-30 22:43:27 +00:00
Scott Taylor
4de850c8ff Improve the @param docs for src/wp-includes/post*.php. 
See #30224.


git-svn-id: https://develop.svn.wordpress.org/trunk@30671 602fd350-edb4-49c9-b593-d223f7449a82
 2014-11-30 22:37:00 +00:00
Andrew Ozz
3c558b7436 TinyMCE: update translatable strings, see #30560. 
git-svn-id: https://develop.svn.wordpress.org/trunk@30670 602fd350-edb4-49c9-b593-d223f7449a82
 2014-11-30 22:26:56 +00:00
Scott Taylor
43885a303e Improve the @param docs for src/includes/rewrite.php. 
See #30224.


git-svn-id: https://develop.svn.wordpress.org/trunk@30669 602fd350-edb4-49c9-b593-d223f7449a82
 2014-11-30 22:24:49 +00:00
Scott Taylor
3008fe1060 Improve the @param docs for src/wp-admin/includes/plugin.php. 
See #30224.


git-svn-id: https://develop.svn.wordpress.org/trunk@30668 602fd350-edb4-49c9-b593-d223f7449a82
 2014-11-30 22:22:33 +00:00
Scott Taylor
4bf6ad11fb Improve the @param docs for src/wp-includes/pluggable*. 
See #30224.


git-svn-id: https://develop.svn.wordpress.org/trunk@30667 602fd350-edb4-49c9-b593-d223f7449a82
 2014-11-30 22:18:33 +00:00
Scott Taylor
c7ce0a4d55 Improve the @param docs for src/wp-includes/user.php. 
See #30224.


git-svn-id: https://develop.svn.wordpress.org/trunk@30666 602fd350-edb4-49c9-b593-d223f7449a82
 2014-11-30 22:10:12 +00:00
Scott Taylor
9e6096c89a Improve the @param docs for src/wp-includes/widgets.php. 
See #30224.


git-svn-id: https://develop.svn.wordpress.org/trunk@30665 602fd350-edb4-49c9-b593-d223f7449a82
 2014-11-30 22:04:23 +00:00
Scott Taylor
35358b0e26 Improve the @param docs for src/wp-includes/wp-db.php. 
See #30224.


git-svn-id: https://develop.svn.wordpress.org/trunk@30664 602fd350-edb4-49c9-b593-d223f7449a82
 2014-11-30 21:54:08 +00:00
Scott Taylor
2bf092065a Add missing @params to src/wp-includes/pomo files. 
See #30224.



git-svn-id: https://develop.svn.wordpress.org/trunk@30663 602fd350-edb4-49c9-b593-d223f7449a82
 2014-11-30 21:40:53 +00:00
Scott Taylor
1da6be4868 Improve the @param docs for trackback_response() and validate_another_blog_signup(). 
See #30224.


git-svn-id: https://develop.svn.wordpress.org/trunk@30662 602fd350-edb4-49c9-b593-d223f7449a82
 2014-11-30 21:22:07 +00:00
Scott Taylor
9c95e2bb81 Use sanitize_mime_type() instead of urlencode() when string-building <option> values in ->get_views() for media list tables. 
`urlencode()` was introduced in [28553] via _duck and yours truly.

Got weirder after [29625].

Props birgire.
Fixes #30123.


git-svn-id: https://develop.svn.wordpress.org/trunk@30661 602fd350-edb4-49c9-b593-d223f7449a82
 2014-11-30 20:22:23 +00:00
Scott Taylor
35708f61f8 Use round() instead of floor() when resizing image dimensions. 
Updates unit tests.

Props SergeyBiryukov, kitchin.
Fixes #18532.


git-svn-id: https://develop.svn.wordpress.org/trunk@30660 602fd350-edb4-49c9-b593-d223f7449a82
 2014-11-30 19:53:18 +00:00
Scott Taylor
dad44082a7 The menu items for users.php and profile.php that require the promote_users cap should be wrapped in an is_multisite() conditional a la user-new.php. 
Props SergeyBiryukov.
Fixes #30526.


git-svn-id: https://develop.svn.wordpress.org/trunk@30659 602fd350-edb4-49c9-b593-d223f7449a82
 2014-11-30 19:17:44 +00:00
Scott Taylor
653485e87f wp_upload_dir() has a (little-known?) side effect: if you call it, it will attempt to create an uploads directory for the current month. As such, tearDown() and cleanup routines have to be in sync with this behavior when deleting bogus directories used in unit tests. 
Examples: if you clean up directories in a test, or a test fails before the directories are cleaned, or a test fails before the `'upload_path'` option is reset, the next call to `wp_upload_dir()` will recreate the directories you just tried to delete.

These changes ensure that `src/foo` and `/tmp/wp-unit-test` directories are deleted immediately after `wp_upload_dir()` is fired in the tests. 
 
Fixes #30513.


git-svn-id: https://develop.svn.wordpress.org/trunk@30658 602fd350-edb4-49c9-b593-d223f7449a82
 2014-11-30 19:05:52 +00:00
Dominik Schilling (ocean90)
2f3fed5a52 Make notices added in [30459] less ugly. 
see #25569, #25571, [30505].

git-svn-id: https://develop.svn.wordpress.org/trunk@30657 602fd350-edb4-49c9-b593-d223f7449a82
 2014-11-30 12:20:04 +00:00
Drew Jaynes (DrewAPicture)
e587324180 Docs Formatting: Backtick-escape inline code for all remaining dynamic hook docs in wp-includes/*. 
Affects DocBlocks for the following hooks:
* `auth_post_meta_{$meta_key}`
* `term_links-$taxonomy`
* `customize_render_control_ . $this->id`
* `customize_render_panel_{$this->id}`
* `customize_render_section_{$this->id}`
* `customize_preview_{$this->id}`
* `customize_save_ . $this->id_data[ 'base' ]`
* `customize_update_ . $this->type`
* `customize_value_ . $this->id_data[ 'base' ]`
* `customize_sanitize_js_{$this->id}`
* `comment_form_field_{$name}`
* `comment_{$old_status}_to_{$new_status}`
* `comment_{$new_status}_{$comment->comment_type}`
* `extra_{$context}_headers`
* `get_template_part_{$slug}`
* `get_the_generator_{$type}`
* `get_{$adjacent}_post_join`
* `get_{$adjacent}_post_where`
* `get_{$adjacent}_post_sort`
* `{$adjacent}_post_rel_link`
* `{$adjacent}_post_link`
* `{$adjacent}_image_link`
* `blog_option_{$option}`
* `$permastructname . _rewrite_rules`
* `{$type}_template`
* `theme_mod_{$name}`
* `pre_set_theme_mod_$name`
* `current_theme_supports-{$feature}`
* `get_user_option_{$option}`
* `edit_user_{$field}`
* `pre_user_{$field}`
* `user_{$field}`

See #30552.


git-svn-id: https://develop.svn.wordpress.org/trunk@30656 602fd350-edb4-49c9-b593-d223f7449a82
 2014-11-30 12:09:56 +00:00
Drew Jaynes (DrewAPicture)
e8bc58459e Docs Formatting: Backtick-escape inline code for all dynamic hook docs in wp-includes/meta.php. 
Affects DocBlocks for the following hooks:
* `add_{$meta_type}_metadata`
* `add_{$meta_type}_meta`
* `added_{$meta_type}_meta`
* `update_{$meta_type}_metadata`
* `update_{$meta_type}_meta`
* `updated_{$meta_type}_meta`
* `delete_{$meta_type}_metadata`
* `delete_{$meta_type}_meta`
* `deleted_{$meta_type}_meta`
* `get_{$meta_type}_metadata`
* `delete_{$meta_type}meta`
* `deleted_{$meta_type}meta`
* `sanitize_{$meta_type}_meta_{$meta_key}`

See #30552.


git-svn-id: https://develop.svn.wordpress.org/trunk@30655 602fd350-edb4-49c9-b593-d223f7449a82
 2014-11-30 12:02:44 +00:00
Drew Jaynes (DrewAPicture)
2546b46f62 Docs Formatting: Backtick-escape inline code for all dynamic hook docs in wp-includes/taxonomy.php. 
Affects DocBlocks for the following hooks:
* `get_$taxonomy`
* `edit_term_{$field}`
* `edit_{$taxonomy}_{$field}`
* `pre_term_{$field}`
* `pre_{$taxonomy}_{$field}`
* `term_{$field}_rss`
* `{$taxonomy}_{$field}_rss`
* `term_{$field}`
* `{$taxonomy}_{$field}`
* `delete_$taxonomy`
* `create_$taxonomy`
* `edit_$taxonomy`
* `edited_$taxonomy`

See #30552.


git-svn-id: https://develop.svn.wordpress.org/trunk@30654 602fd350-edb4-49c9-b593-d223f7449a82
 2014-11-30 11:59:26 +00:00
Drew Jaynes (DrewAPicture)
973af104ff Docs Formatting: Backtick-escape inline code for all dynamic hook docs in wp-includes/post.php. 
Affects DocBlocks for the following hooks:
* `post_type_labels_{$post_type}`
* `edit_{$field}`
* `{$field_no_prefix}_edit_pre`
* `pre_{$field}`
* `{$field_no_prefix}_save_pre`
* `{$field}_pre`
* `$field`
* `save_post_{$post->post_type}`
* `{$old_status}_to_{$new_status}`
* `{$new_status}_{$post->post_type}`

See #30552.


git-svn-id: https://develop.svn.wordpress.org/trunk@30653 602fd350-edb4-49c9-b593-d223f7449a82
 2014-11-30 11:55:58 +00:00
Drew Jaynes (DrewAPicture)
27a0f38b9e Docs Formatting: Backtick-escape inline code for all dynamic hook docs in wp-includes/option.php. 
Affects DocBlocks for the following hooks:
* `pre_option_ . $option`
* `default_option_ . $option`
* `option_ . $option`
* `pre_update_option_ . $option`
* `update_option_{$option}`
* `add_option_{$option}`
* `delete_option_$option`
* `delete_transient_ . $transient`
* `pre_transient_ . $transient`
* `transient_ . $transient`
* `pre_set_transient_ . $transient`
* `set_transient_ . $transient`
* `pre_site_option_ . $option`
* `default_site_option_ . $option`
* `site_option_ . $option`
* `pre_add_site_option_ . $option`
* `add_site_option_{$option}`
* `pre_delete_site_option_ . $option`
* `delete_site_option_{$option}`
* `pre_update_site_option_ . $option`
* `update_site_option_{$option}`
* `delete_site_transient_ . $transient`
* `pre_site_transient_ . $transient`
* `site_transient_ . $transient`
* `pre_set_site_transient_ . $transient`
* `set_site_transient_ . $transient`

See #30552.


git-svn-id: https://develop.svn.wordpress.org/trunk@30652 602fd350-edb4-49c9-b593-d223f7449a82
 2014-11-30 11:52:33 +00:00
Drew Jaynes (DrewAPicture)
ebdb7cb273 Docs Formatting: Backtick-escape inline code for the login_form_ . $action dynamic hook in wp-login.php. 
See #30552.


git-svn-id: https://develop.svn.wordpress.org/trunk@30651 602fd350-edb4-49c9-b593-d223f7449a82
 2014-11-30 11:44:29 +00:00
Dominik Schilling (ocean90)
cccd0c63c1 Update the Iris color picker to version 1.0.7. 
Includes a fix for multiple pickers on the same page.
Changes: https://github.com/Automattic/Iris/compare/1.0.6...1.0.7

props mattwiebe.
fixes #30537.

git-svn-id: https://develop.svn.wordpress.org/trunk@30650 602fd350-edb4-49c9-b593-d223f7449a82
 2014-11-30 11:44:00 +00:00
Drew Jaynes (DrewAPicture)
b90807cccd Docs Formatting: Backtick-escape inline code for all dynamic hook docs in wp-admin/*. 
Also includes some changes to move hook docs to directly precede hook lines. This is necessary to prevent DocBlock-matching confusion when core is parsed.

Affects DocBlocks for the following hooks:
* `wp_ajax_ . $_REQUEST['action']`
* `wp_ajax_nopriv_ . $_REQUEST['action']`
* `admin_footer- . $GLOBALS['hook_suffix']`
* `admin_head-$hook_suffix`
* `admin_post_nopriv_{$action}`
* `admin_post_{$action}`
* `load-  . $page_hook`
* `load- . $plugin_page`
* `load-importer- . $importer`
* `load- . $pagenow`
* `admin_action_ . $_REQUEST['action']`
* `async_upload_{$type}`
* `add_meta_boxes_ . $post_type`
* `{$taxonomy}_pre_edit_form`
* `{$taxonomy}_term_edit_form_tag`
* `{$taxonomy}_edit_form_fields`
* `{$taxonomy}_edit_form`
* `after-{$taxonomy}-table`
* `{$taxonomy}_pre_add_form`
* `{$taxonomy}_term_new_form_tag`
* `{$taxonomy}_add_form_fields`
* `{$taxonomy}_add_form`
* `media_upload_$type`
* `media_upload_$tab`
* `install_plugins_pre_$tab`
* `install_plugins_$tab`
* `install_themes_pre_{$tab}`
* `install_themes_{$tab}`
* `update-core-custom_{$action}`
* `update-custom_{$action}`
* `user_{$name}_label`

See #30552.


git-svn-id: https://develop.svn.wordpress.org/trunk@30649 602fd350-edb4-49c9-b593-d223f7449a82
 2014-11-30 11:42:00 +00:00
Drew Jaynes (DrewAPicture)
f45fd382b3 Docs Formatting: Backtick-escape inline code for all dynamic hook docs in wp-admin/includes/*. 
Also adds a few inline `@see` cross-references as they apply.

Affects DocBlocks for the following hooks:
* `views_{$this->screen->id}`
* `bulk_actions-{$this->screen->id}`
* `manage_{$this->screen->id}_sortable_columns`
* `theme_action_links_$stylesheet`
* `after_theme_row_$stylesheet`
* `install_plugins_table_api_args_$tab`
* `$prefix . plugin_action_links`
* `after_plugin_row_$plugin_file`
* `manage_taxonomies_for_{$post_type}_columns`
* `manage_{$post_type}_posts_columns`
* `manage_{$post->post_type}_posts_custom_column`
* `{$taxonomy}_row_actions`
* `manage_{$this->screen->taxonomy}_custom_column`
* `install_themes_table_api_args_' . $tab`
* `auto_update_ . $type`
* `{$action}_prefilter`
* `admin_head_{$content_func}`
* `nav_menu_items_{$post_type_name}`
* `activate_ . $plugin`
* `deactivate_ . $plugin`
* `edit_{$post_type}_per_page`
* `postbox_classes_{$page}_{$id}`
* `_wp_post_revision_field_$field`
* `manage_{$screen->id}_columns`
* `in_plugin_update_message-{$file}`
* `in_theme_update_message-{$theme_key}`

See #30552.


git-svn-id: https://develop.svn.wordpress.org/trunk@30648 602fd350-edb4-49c9-b593-d223f7449a82
 2014-11-30 11:27:19 +00:00
Drew Jaynes (DrewAPicture)
57ff8aff0a Docs Formatting: Backtick-escape inline code for all dynamic hook docs in wp-admin/network/*. 
Affects DocBlocks for the following hooks:
* `network_admin_edit_' . $_GET['action']`
* `network_sites_updated_message_' . $_GET['updated']`

See #30552.


git-svn-id: https://develop.svn.wordpress.org/trunk@30647 602fd350-edb4-49c9-b593-d223f7449a82
 2014-11-30 11:20:32 +00:00
Drew Jaynes (DrewAPicture)
1f66186c4a Improve inline documentation for image_constrain_size_for_editor(). 
Includes:
* Proper formatting, plus adding a type for the `$context` parameter
* Inline `@see` tags in the description and backtick-escaping inline code
* Parameter, type, and description alignment

Props tillkruess for the initial patch.
Fixes #30508.


git-svn-id: https://develop.svn.wordpress.org/trunk@30646 602fd350-edb4-49c9-b593-d223f7449a82
 2014-11-30 10:05:26 +00:00
Drew Jaynes (DrewAPicture)
688b291312 Specify a type (array) for the $post_data parameter in the DocBlock for wp_autosave(). 
Props tillkruess.
See #30508.


git-svn-id: https://develop.svn.wordpress.org/trunk@30645 602fd350-edb4-49c9-b593-d223f7449a82
 2014-11-30 10:00:56 +00:00
Drew Jaynes (DrewAPicture)
33418eeed5 Improve the inline documentation for image_edit_apply_changes(). 
Including:
* Add a correct type (array) for the `$changes` parameter
* Add the `@since` version
* Add proper descriptions for both parameters and the return value.

Props tillkruess for the initial patch.
See #30508.


git-svn-id: https://develop.svn.wordpress.org/trunk@30644 602fd350-edb4-49c9-b593-d223f7449a82
 2014-11-30 09:58:54 +00:00
Drew Jaynes (DrewAPicture)
c52dc42879 Add an entry to the changelog for the wp_editor_expand hook denoting that the $post_type parameter was added in 4.1.0. 
See #30458.


git-svn-id: https://develop.svn.wordpress.org/trunk@30643 602fd350-edb4-49c9-b593-d223f7449a82
 2014-11-30 09:50:46 +00:00
Scott Taylor
7d95a91c5b When creating audio and video MCE views, listen to the players within each iframe to capture the "play" event. When a player plays, pause the players in every other iframe sandbox. 
Fixes #29384.


git-svn-id: https://develop.svn.wordpress.org/trunk@30642 602fd350-edb4-49c9-b593-d223f7449a82
 2014-11-30 08:44:21 +00:00
Andrew Ozz
8dabfb3b85 Editor: no pointer for DFW v2 when editor-scrolling is not used. Pass $post_type in the wp_editor_expand filter. See #30458. 
git-svn-id: https://develop.svn.wordpress.org/trunk@30641 602fd350-edb4-49c9-b593-d223f7449a82
 2014-11-30 06:36:59 +00:00
Scott Taylor
a411918199 Adjust the RegEx in wp_check_filetype() to be aware that query strings are thing that exist sometimes in URLs. 
Adds unit tests.

Props voldemortensen.
Fixes #30377.


git-svn-id: https://develop.svn.wordpress.org/trunk@30640 602fd350-edb4-49c9-b593-d223f7449a82
 2014-11-30 06:32:16 +00:00
Scott Taylor
b59b9f466a Fix edge-case in media cropping where selection and destination are the same size. 
Adds unit tests.

Props mboynes.
Fixes #19793.


git-svn-id: https://develop.svn.wordpress.org/trunk@30639 602fd350-edb4-49c9-b593-d223f7449a82
 2014-11-30 06:26:26 +00:00
Scott Taylor
ac2c986831 When deleting media grid attachments, wait until the server responds before removing the model from its collection. 
Props 5um17.
Fixes #30457.


git-svn-id: https://develop.svn.wordpress.org/trunk@30638 602fd350-edb4-49c9-b593-d223f7449a82
 2014-11-30 06:18:07 +00:00
Scott Taylor
8813419225 IETF language changes in MediaElement: 
https://github.com/johndyer/mediaelement/pull/1270/

Reverts [28801].
Fixes #29182.


git-svn-id: https://develop.svn.wordpress.org/trunk@30637 602fd350-edb4-49c9-b593-d223f7449a82
 2014-11-30 06:11:19 +00:00
Scott Taylor
cb648b68e1 Ensure uniqueness when returning page lists in get_page_children(). Fixes failing unit tests. 
Props boonebgorges.
Reverts [30246].
Fixes #14477.


git-svn-id: https://develop.svn.wordpress.org/trunk@30636 602fd350-edb4-49c9-b593-d223f7449a82
 2014-11-30 06:04:31 +00:00
Drew Jaynes (DrewAPicture)
2afe26faa5 Remove an invalid parameter from the DocBlock for the gallery_style hook. 
Props keesiemeijer.
Fixes #30507.


git-svn-id: https://develop.svn.wordpress.org/trunk@30635 602fd350-edb4-49c9-b593-d223f7449a82
 2014-11-30 05:57:43 +00:00
Scott Taylor
6d7bbcbc04 Upgrade to MediaElement 2.16.2 
https://github.com/johndyer/mediaelement/compare/2.15.1...2.16.2

Fixes #30281.


git-svn-id: https://develop.svn.wordpress.org/trunk@30634 602fd350-edb4-49c9-b593-d223f7449a82
 2014-11-30 05:57:25 +00:00
Drew Jaynes (DrewAPicture)
7c421791c2 Remove return descriptions from the DocBlocks for add_image_size() and set_post_thumbnail_size() as they don't return anything. 
Also document the `$_wp_additional_image_sizes` global, leveraged in `add_image_size()`.

Props stevegrunwell.
Fixes #30511.


git-svn-id: https://develop.svn.wordpress.org/trunk@30633 602fd350-edb4-49c9-b593-d223f7449a82
 2014-11-30 05:48:03 +00:00
Drew Jaynes (DrewAPicture)
f864c2f871 Document the $user_id parameter added to the 'admin_color_scheme_picker' hook in 3.8.1. 
Props Ipstenu.
Fixes #30551.


git-svn-id: https://develop.svn.wordpress.org/trunk@30632 602fd350-edb4-49c9-b593-d223f7449a82
 2014-11-30 05:41:31 +00:00
Gary Pendergast
ea89b1c942 WPDB Unit Tests: Fix a fatal error that occurs in the test_strip_invalid_text() test if the mbstring extension isn't activated in PHP. 
git-svn-id: https://develop.svn.wordpress.org/trunk@30631 602fd350-edb4-49c9-b593-d223f7449a82
 2014-11-30 05:35:00 +00:00
Drew Jaynes (DrewAPicture)
9d74e43a4b Add missing DocBlocks for several functions in wp-admin/includes/ms.php. 
Props dustyf.
See #30483.


git-svn-id: https://develop.svn.wordpress.org/trunk@30630 602fd350-edb4-49c9-b593-d223f7449a82
 2014-11-30 05:05:36 +00:00
John Blackbourn
76a9abd7a7 Check attachments as well as the current post type when checking for duplicate post slugs. This avoids creating a page with a slug which conflicts with an existing attachment (the inverse is already handled). 
Updates the existing test for pages which should take priority over attachments in cases where an existing clash exists.

Fixes #18962
Props boonebgorges


git-svn-id: https://develop.svn.wordpress.org/trunk@30629 602fd350-edb4-49c9-b593-d223f7449a82
 2014-11-30 04:48:54 +00:00
Drew Jaynes (DrewAPicture)
c1d0555b32 Add missing return descriptions for a variety of functions in wp-includes/link-template.php. 
Props colorful-tones, dustyf.
See #30406.


git-svn-id: https://develop.svn.wordpress.org/trunk@30628 602fd350-edb4-49c9-b593-d223f7449a82
 2014-11-30 04:43:44 +00:00
Drew Jaynes (DrewAPicture)
4c44e257b5 Use the correct type (integer) for the $menu_id parameter in the wp_get_nav_menu_to_edit() DocBlock. 
Also properly mark the parameter as optional and specify the default value.

Props jaimieolmstead for the initial patch.
Fixes #30540.


git-svn-id: https://develop.svn.wordpress.org/trunk@30627 602fd350-edb4-49c9-b593-d223f7449a82
 2014-11-30 04:24:25 +00:00
Boone Gorges
11ef3c3ee6 In get_default_post_to_edit(), let 'post_name' be passed to filter. 
Previously, it was being overridden after the default post had been inserted
into the database, making it cumbersome to override with the 'wp_insert_post_data'
filter.

Props danielbachhuber.
Fixes #29847.

git-svn-id: https://develop.svn.wordpress.org/trunk@30626 602fd350-edb4-49c9-b593-d223f7449a82
 2014-11-29 19:25:36 +00:00