Commit Graph

488 Commits

Author SHA1 Message Date
Drew Jaynes 61115eac58 Docs: Improve documentation for `get_site_icon_url()`, introduced in [32994].
Adds a missing `@since` version, fixes optional parameter syntax, adds default values, and fixes the return description.

See #32246.

Built from https://develop.svn.wordpress.org/trunk@35064


git-svn-id: http://core.svn.wordpress.org/trunk@35029 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-10-12 16:38:24 +00:00
John Blackbourn 939ef7887e `shttp` is not a protocol.
See #27115

Built from https://develop.svn.wordpress.org/trunk@34784


git-svn-id: http://core.svn.wordpress.org/trunk@34749 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-10-02 22:48:26 +00:00
John Blackbourn 815635548a Switch the remaining user-facing links to wordpress.org over to HTTPS.
Fixes #27115

Built from https://develop.svn.wordpress.org/trunk@34783


git-svn-id: http://core.svn.wordpress.org/trunk@34748 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-10-02 22:46:28 +00:00
Drew Jaynes 1d86c9c1ed Docs: Move the hook doc to once again directly precede the hook line for the `getarchives_where` filter following [34686].
See #21596.

Built from https://develop.svn.wordpress.org/trunk@34689


git-svn-id: http://core.svn.wordpress.org/trunk@34653 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-09-29 06:39:25 +00:00
Scott Taylor eeb539e90f Allow `wp_get_archives()` to accept `post_type` as an arg.
Adds unit test.

Fixes #21596.

Built from https://develop.svn.wordpress.org/trunk@34686


git-svn-id: http://core.svn.wordpress.org/trunk@34650 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-09-29 05:11:24 +00:00
Scott Taylor ffb8ae1a63 Date/Time: Add unit tests for `the_date()`.
Props jubstuff.
Fixes #33750.

Built from https://develop.svn.wordpress.org/trunk@34474


git-svn-id: http://core.svn.wordpress.org/trunk@34438 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-09-24 03:34:24 +00:00
Scott Taylor a2914473cc Calendar Widget: remove the `title` attribute for days and replace with `aria-label`. Spruce up some of this nasty code. Delete unnecessary bits.
Props wonderboymusic, elusiveunit, 5um17. 
Fixes #30297.

Built from https://develop.svn.wordpress.org/trunk@34463


git-svn-id: http://core.svn.wordpress.org/trunk@34427 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-09-23 23:57:27 +00:00
Scott Taylor 84da11d918 Pass `false` as the 2nd argument to `class_exists()` to disable autoloading and to not cause problems for those who define `__autoload()`.
Fixes #20523.

Built from https://develop.svn.wordpress.org/trunk@34348


git-svn-id: http://core.svn.wordpress.org/trunk@34312 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-09-20 03:52:25 +00:00
Scott Taylor 518404a166 Site Icon: for consistency, make all 4 HTML tags in `wp_site_icon()` self-closing.
Props Corphi.
Fixes #33930.

Built from https://develop.svn.wordpress.org/trunk@34334


git-svn-id: http://core.svn.wordpress.org/trunk@34298 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-09-19 19:07:27 +00:00
John Blackbourn a9e5cfddc7 Implement `wp_login_url()` and `wp_registration_url()` in places where `wp-login.php` is currently hard-coded.
See #31495
Props GregLone

Built from https://develop.svn.wordpress.org/trunk@34213


git-svn-id: http://core.svn.wordpress.org/trunk@34177 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-09-15 17:11:35 +00:00
John Blackbourn 504cd3bf15 Remove the 'Site Admin' link from the Meta widget if the user doesn't have access to the admin area.
See #25162

Built from https://develop.svn.wordpress.org/trunk@33929


git-svn-id: http://core.svn.wordpress.org/trunk@33898 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-09-05 23:25:24 +00:00
Sergey Biryukov db71d238dd Correct `@since` version for [33838].
props JustinSainton.
see #23692.
Built from https://develop.svn.wordpress.org/trunk@33839


git-svn-id: http://core.svn.wordpress.org/trunk@33807 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-09-01 03:14:21 +00:00
Sergey Biryukov 13540a6b30 Add filters to `feed_links()` to choose whether to display the links to posts feed and comments feed, separately.
props joostdevalk, juliobox.
fixes #23692.
Built from https://develop.svn.wordpress.org/trunk@33838


git-svn-id: http://core.svn.wordpress.org/trunk@33806 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-09-01 02:46:21 +00:00
Konstantin Obenland dfa53a1da7 Site Icon: Improvements to Site Icon API.
* Only call `get_blog_option()` when there is a blog id and we're in Mulitsite. If there is no blog id the request is for the current blog.
* Check return value of `wp_get_attachment_image_src()` before getting the URL since it could be `false`.
* Use `{bool}` rather than `!!` to return a boolean value.

Props MikeHansenMe, obenland.
Fixes #33326.


Built from https://develop.svn.wordpress.org/trunk@33606


git-svn-id: http://core.svn.wordpress.org/trunk@33573 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-08-11 16:25:27 +00:00
Helen Hou-Sandí 731c255aee Site icon: Rearrange function parameters to avoid frequently passing empty values.
props obenland.
fixes #33325.

Built from https://develop.svn.wordpress.org/trunk@33605


git-svn-id: http://core.svn.wordpress.org/trunk@33572 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-08-10 20:15:26 +00:00
Drew Jaynes 9619558b0b Fix inline documentation syntax for the `language_attributes()` DocBlock.
See #32246. See #32891.

Built from https://develop.svn.wordpress.org/trunk@33229


git-svn-id: http://core.svn.wordpress.org/trunk@33201 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-07-13 21:40:25 +00:00
Drew Jaynes 2d14bd09b9 Fix inline documentation syntax in the DocBlock for `get_language_attributes()`, introduced in 4.3.
See [32868]. See #32891.

Built from https://develop.svn.wordpress.org/trunk@33228


git-svn-id: http://core.svn.wordpress.org/trunk@33200 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-07-13 21:39:24 +00:00
Drew Jaynes ffb873680a Fix the summary hook vernacular for the `site_icon_meta_tags` filter docs.
See [32994]. See #32891.

Built from https://develop.svn.wordpress.org/trunk@33227


git-svn-id: http://core.svn.wordpress.org/trunk@33199 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-07-13 21:37:24 +00:00
Konstantin Obenland 2829827c1c Site Icon: Add Android-specific app icon.
Falling back to Apple app icons is deprecated behavior and will not work
forever. 192px is the recommended size for that icon.

Props kraftbj.
Fixes #32964.


Built from https://develop.svn.wordpress.org/trunk@33202


git-svn-id: http://core.svn.wordpress.org/trunk@33174 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-07-13 17:58:47 +00:00
Konstantin Obenland f29e5044cd Site Icon: Add Customizer UI.
Second part of the Site Icon feature after [32994] introduced it for Settings.

Props celloexpressions.
See #16434.


Built from https://develop.svn.wordpress.org/trunk@33154


git-svn-id: http://core.svn.wordpress.org/trunk@33126 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-07-10 21:33:24 +00:00
Konstantin Obenland c56a8ae0f7 Introducing Site Icon, favicon management for WordPress.
This v1 marries Jetpack's Site Icon module with the Media Modal, reusing code
from the Custom Header admin. For now, the core-provided icons will be limited
to a favicon, an iOS app icon, and a Windows tile icon, leaving `.ico` support
and additional icons to plugins to add.

Props obenland, tyxla, flixos90, jancbeck, markjaquith, scruffian.
See #16434.


Built from https://develop.svn.wordpress.org/trunk@32994


git-svn-id: http://core.svn.wordpress.org/trunk@32965 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-06-29 12:58:25 +00:00
Andrew Ozz eaadfde950 Define `SCRIPT_DEBUG` early on every load, similarly to `WP_DEBUG`. Remove `defined( 'SCRIPT_DEBUG' )` checks.
Fixes #32333.
Built from https://develop.svn.wordpress.org/trunk@32935


git-svn-id: http://core.svn.wordpress.org/trunk@32906 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-06-25 02:29:31 +00:00
Drew Jaynes e2c7542b68 Add a changelog entry to the DocBlock for `language_attributes()` noting that it was converted into a wrapper for `get_language_attributes()` in 4.3.
See [32868]. See #28180.

Built from https://develop.svn.wordpress.org/trunk@32882


git-svn-id: http://core.svn.wordpress.org/trunk@32853 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-06-19 23:01:26 +00:00
Scott Taylor 38037c8d62 Add `get_language_attributes()`, which is then used by (...drum roll...) `language_attributes()`.
Props johnbillion, posykrat, PeterRKnight.
Fixes #28180.

Built from https://develop.svn.wordpress.org/trunk@32868


git-svn-id: http://core.svn.wordpress.org/trunk@32839 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-06-19 21:36:28 +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
Scott Taylor 82f5d2e9b5 Cleanup doc blocks in `general-template.php`.
See #32444.

Built from https://develop.svn.wordpress.org/trunk@32598


git-svn-id: http://core.svn.wordpress.org/trunk@32568 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-05-25 17:18:26 +00:00
Scott Taylor af7a017f46 When calling `unset()`, it is unnecessary to immediately precede it with a call to `isset()`.
See #32444.

Built from https://develop.svn.wordpress.org/trunk@32545


git-svn-id: http://core.svn.wordpress.org/trunk@32515 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-05-22 05:47:25 +00:00
Boone Gorges 29216371bd In `paginate_links()`, improve handling of custom pagination query vars.
Custom pagination query vars, as provided in the 'base' parameter, must be
detected in the current page URL and removed before generating fresh pagination
links. The logic introduced in this changeset ensures that these custom
query vars are properly detected in cases where the 'format' param contains
a `#`.

This is a follow-up to [31203] #30831.

Fixes #31939.
Built from https://develop.svn.wordpress.org/trunk@32359


git-svn-id: http://core.svn.wordpress.org/trunk@32330 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-05-05 21:59:26 +00:00
Helen Hou-Sandí bfda508c18 Update more instances of default admin blues and grays.
props hugobaeta.
fixes #31234.

Built from https://develop.svn.wordpress.org/trunk@32051


git-svn-id: http://core.svn.wordpress.org/trunk@32030 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-04-05 21:20:27 +00:00
Dominik Schilling 502c70ec99 Remove `<code>` tags from translatable strings.
Uncomment deprecation notice for `get_bloginfo( 'text_direction' )`, see [14360].

props ramiy, DrewAPicture.
fixes #30614.
Built from https://develop.svn.wordpress.org/trunk@31899


git-svn-id: http://core.svn.wordpress.org/trunk@31878 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-03-26 15:17:28 +00:00
Drew Jaynes 88c109e919 Document default arguments for `paginate_links()` as a hash notation.
Props atimmer.
Fixes #31433.

Built from https://develop.svn.wordpress.org/trunk@31854


git-svn-id: http://core.svn.wordpress.org/trunk@31833 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-03-20 20:04:27 +00:00
Boone Gorges 48a5bbf8a7 Provide a secondary sort order for `wp_get_archives()` when `type=postbypost`.
Sorting by post_date alone can cause indeterminacy problems on different
versions of MySQL when post_date ties need to be broken. Using `ID` as a
secondary sort ensures that the order is always determinate.

Props herbmillerjr for an initial patch.
Fixes #30480.
Built from https://develop.svn.wordpress.org/trunk@31452


git-svn-id: http://core.svn.wordpress.org/trunk@31433 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-02-13 17:00:27 +00:00
Dion Hulse 3745cdc740 Avoid a PHP Warning when `add_args` is passed as `false` to `paginate_links()`.
Props boonebgorges for the unit test.
See #30831 [31203].

Built from https://develop.svn.wordpress.org/trunk@31432


git-svn-id: http://core.svn.wordpress.org/trunk@31413 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-02-12 01:39:27 +00:00
Sergey Biryukov 34d06ee6b7 Add a changelog entry for the new parameter added in [31228].
props DrewAPicture.
fixes #31015.
Built from https://develop.svn.wordpress.org/trunk@31229


git-svn-id: http://core.svn.wordpress.org/trunk@31210 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-01-17 17:31:23 +00:00
Sergey Biryukov 4e90a18c7c Pass $force_reauth value to the 'login_url' filter.
props jfarthing84, MikeHansenMe.
fixes #31015.
Built from https://develop.svn.wordpress.org/trunk@31228


git-svn-id: http://core.svn.wordpress.org/trunk@31209 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-01-17 17:20:23 +00:00
Boone Gorges fb691a449b In `paginate_links()`, don't override custom format arguments when setting up default 'add_args'.
Since 4.1 [29780], the default value of the 'add_args' argument in
`paginate_links()` has been determined by parsing the current URL. This change
had the side effect of overriding custom values of 'format' that changed the
pagination query var, with the result that plugins using `paginate_links()`
with a custom format generated the incorrect links unless explicitly
declaring 'add_args=false' to prevent the default values from overriding. We
fix this behavior by parsing URL query vars into the 'add_args' array only
after the explicit function params have been parsed, and by skipping the
current page's pagination query var when doing this parsing (to avoid the
override).

Props obenland.
Fixes #30831 for trunk.
Built from https://develop.svn.wordpress.org/trunk@31203


git-svn-id: http://core.svn.wordpress.org/trunk@31184 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-01-16 15:49:25 +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
Drew Jaynes f2bc30c03f Ensure we're using the correct `@ignore` phpDocumentor tag to mark elements that should be skipped when parsing.
Up to this point, various core elements' DocBlocks incorrectly included an `@internal` tag as a means for skipping the parsing process. When paired with a description (inline or otherwise), `@internal` is a valid tag meant to provide internal-only context, but not necessarily to skip parsing the entire element.

See #30987.

Built from https://develop.svn.wordpress.org/trunk@31170


git-svn-id: http://core.svn.wordpress.org/trunk@31151 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-01-13 00:51:21 +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
Scott Taylor 786caa4d55 Correct the `@param` docs for arguments that are truthy/falsey.
See #30799.

Built from https://develop.svn.wordpress.org/trunk@30983


git-svn-id: http://core.svn.wordpress.org/trunk@30969 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-12-20 23:04:23 +00:00
Scott Taylor 5eb5afac34 For clarity, initialize some arrays that previously were only assigned via short circuit in loops.
See #30799.

Built from https://develop.svn.wordpress.org/trunk@30982


git-svn-id: http://core.svn.wordpress.org/trunk@30968 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-12-20 22:47:22 +00:00
Andrew Nacin 498be1cae9 Avoid repeatedly calling is_tax( 'post_format', '...' ) in get_the_archive_title().
see #21995.

Built from https://develop.svn.wordpress.org/trunk@30854


git-svn-id: http://core.svn.wordpress.org/trunk@30844 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-12-15 07:32:26 +00:00
Scott Taylor 37a23b2c73 Improve various `@param` docs.
See #30224.

Built from https://develop.svn.wordpress.org/trunk@30682


git-svn-id: http://core.svn.wordpress.org/trunk@30672 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-12-01 02:17:21 +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
Drew Jaynes bffe95d34c 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.

Built from https://develop.svn.wordpress.org/trunk@30656


git-svn-id: http://core.svn.wordpress.org/trunk@30646 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-11-30 12:10:23 +00:00
Drew Jaynes a4be4f520f Ensure the private function `_wp_render_title_tag()` is marked for internal usage only.
See #30469.

Built from https://develop.svn.wordpress.org/trunk@30615


git-svn-id: http://core.svn.wordpress.org/trunk@30605 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-11-28 11:50:22 +00:00
Drew Jaynes 07c58f5cca Ensure inline code is markdown-escaped as such, HTML tags are removed from summaries, and that code snippets in descriptions are properly indented.
Affects DocBlocks for the following core elements:
* Markdown-indent a code snippet in the description for `_deprecated_argument()`
* Markdown-indent a code snippet in the description for `wp_localize_script()`
* Backtick-escape HTML tags in two parameter descriptions for `wp_register()`
* Various DocBlock formatting in the description for `get_bloginfo()`
* Remove HTML tag from the summary for `_wp_render_title_tag()`
* Backtick-escape a HTML tag in the description for `get_archives_link()`
* Markdown-indent a code snippet in the description for `wp_admin_css_color()`
* Markdown-indent a code snippet in the description for the `welcome_panel` hook

Props rarst.
See #30473.

Built from https://develop.svn.wordpress.org/trunk@30541


git-svn-id: http://core.svn.wordpress.org/trunk@30530 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-11-24 05:39:22 +00:00
Drew Jaynes 784e162177 Cross reference `get_the_archive_title()` and `get_the_archive_description()` in the inline documentation for their corresponding template tags.
Also define the default values for `$before` and `$after` in the template tag documentation.

See [30223]. See #21995.

Built from https://develop.svn.wordpress.org/trunk@30224


git-svn-id: http://core.svn.wordpress.org/trunk@30224 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-11-04 06:52:23 +00:00
John Blackbourn 6a45f46937 Introduce some new template functions for archive titles and descriptions:
* `get_the_archive_title()` and `the_archive_title()` for returning/displaying the title of the current term, date, post type, post format, or author archive.
 * `get_the_archive_description()` and `the_archive_description()` for returning/displaying the description associated with the current term archive.

Fixes #21995
Props obenland, DrewAPicture

Built from https://develop.svn.wordpress.org/trunk@30223


git-svn-id: http://core.svn.wordpress.org/trunk@30223 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-11-04 00:35:22 +00:00
Scott Taylor 8d0e8942eb [28785] introduced a bug, where encoded query arguments were decoded by `parse_str()` inside of `wp_parse_str()` but never re-encoded later on.
This encodes them, adds unit test.

Props obenland.
Fixes #29636.

Built from https://develop.svn.wordpress.org/trunk@30133


git-svn-id: http://core.svn.wordpress.org/trunk@30133 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-11-01 00:54:23 +00:00