Scott Taylor
a1bd091d65
In `get_attachment_template()`, pass an array of templates to `get_query_template( 'attachment', $templates )`, instead of bailing on the first found template.
...
Props willnorris, jfarthing84, SergeyBiryukov, DrewAPicture, wonderboymusic.
Fixes #15337 .
Built from https://develop.svn.wordpress.org/trunk@32804
git-svn-id: http://core.svn.wordpress.org/trunk@32775 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-06-16 20:50:26 +00:00
Scott Taylor
0cc29d8bb7
In `wp_nav_menu()`, ensure that the `$menu` arg is populated when passed to filters.
...
Props greuben, chriscct7.
Fixes #16594 .
Built from https://develop.svn.wordpress.org/trunk@32803
git-svn-id: http://core.svn.wordpress.org/trunk@32774 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-06-16 20:33:25 +00:00
Scott Taylor
6148f3cd41
Add a class method to `wpLink`, `buildHtml()`. This will allows devs to duck-punch the implementation.
...
Props martinsachse.
Fixes #32180 .
Built from https://develop.svn.wordpress.org/trunk@32802
git-svn-id: http://core.svn.wordpress.org/trunk@32773 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-06-16 20:20:26 +00:00
Scott Taylor
45d5037a10
Avoid using HTML in translation strings in `edit-form-comment.php`.
...
Fixes #31847 .
Built from https://develop.svn.wordpress.org/trunk@32801
git-svn-id: http://core.svn.wordpress.org/trunk@32772 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-06-16 20:08:24 +00:00
Scott Taylor
5c6b63d3a6
`if` is a statment, not a function.
...
See #32444 .
Built from https://develop.svn.wordpress.org/trunk@32800
git-svn-id: http://core.svn.wordpress.org/trunk@32771 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-06-16 20:01:25 +00:00
Scott Taylor
5e14470894
Avoid using `<code>` in a translation string.
...
Props ramiy.
Fixes #31848 .
Built from https://develop.svn.wordpress.org/trunk@32799
git-svn-id: http://core.svn.wordpress.org/trunk@32770 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-06-16 19:53:27 +00:00
Helen Hou-Sandí
a49c192f37
Media list table: Restore row actions.
...
see #29881 , #32657 .
Built from https://develop.svn.wordpress.org/trunk@32798
git-svn-id: http://core.svn.wordpress.org/trunk@32769 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-06-16 19:47:24 +00:00
Scott Taylor
efbb8fa4e5
Document the default list of allowed protocols in the doc block for `wp_allowed_protocols()` and cross-reference in `esc_url()` and the `kses_allowed_protocols` filter.
...
Props GunGeekATX.
Fixes #32421 .
Built from https://develop.svn.wordpress.org/trunk@32797
git-svn-id: http://core.svn.wordpress.org/trunk@32768 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-06-16 19:45:26 +00:00
Helen Hou-Sandí
457456ef25
Comments: Better markup for the edit screen.
...
Previously there were no labels, and since labels can't contain links and the links were of dubious value, we've removed those.
props afercia, DrewAPicture.
fixes #31326 .
Built from https://develop.svn.wordpress.org/trunk@32796
git-svn-id: http://core.svn.wordpress.org/trunk@32767 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-06-16 18:54:26 +00:00
Ella Iseulde Van Dorpe
dd0bff051a
TinyMCE: wptextpattern: Add blockquote and headings
...
As discussed in the editor meeting 9 June.
We should re-evaluate these additions towards the end of the release.
See #31441 .
Built from https://develop.svn.wordpress.org/trunk@32795
git-svn-id: http://core.svn.wordpress.org/trunk@32766 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-06-16 13:52:25 +00:00
Boone Gorges
0768626735
Clean up uploaded file after `test_media_handle_upload_sets_post_excerpt()`.
...
Props McGuive7.
Fixes #32534 .
Built from https://develop.svn.wordpress.org/trunk@32794
git-svn-id: http://core.svn.wordpress.org/trunk@32765 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-06-16 12:38:27 +00:00
Dion Hulse
2b2368d68f
Add a filter to wp_safe_redirect() for the fallback URL.
...
Props anubisthejackle. Fixes #22612
Built from https://develop.svn.wordpress.org/trunk@32793
git-svn-id: http://core.svn.wordpress.org/trunk@32764 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-06-16 05:26:26 +00:00
Boone Gorges
66c1d75c1c
Tag/category conversion link on edit-tags.php should point to specific importer page when cat2tag plugin is active.
...
Props solarissmoke, c3mdigital.
Fixes #16369 .
Built from https://develop.svn.wordpress.org/trunk@32792
git-svn-id: http://core.svn.wordpress.org/trunk@32763 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-06-16 04:30:26 +00:00
Scott Taylor
362704ab9a
`sanitize_option()` needs to handle `WP_Error`. DRY the conditional calls to `add_settings_error()`.
...
Props chriscct7 for an initial patch.
Fixes #32350 .
Built from https://develop.svn.wordpress.org/trunk@32791
git-svn-id: http://core.svn.wordpress.org/trunk@32762 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-06-16 01:29:27 +00:00
Scott Taylor
8df67cb188
Add a note to `wptexturize()` docs.
...
Props miqrogroove.
Fixes #32521 .
Built from https://develop.svn.wordpress.org/trunk@32790
git-svn-id: http://core.svn.wordpress.org/trunk@32761 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-06-16 00:57:24 +00:00
Scott Taylor
2043805da4
Improve the consistency of punctuation matching in `wptexturize()`.
...
Adds unit tests.
Props miqrogroove.
Fixes #31886 .
Built from https://develop.svn.wordpress.org/trunk@32789
git-svn-id: http://core.svn.wordpress.org/trunk@32760 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-06-16 00:50:25 +00:00
Scott Taylor
7db2c06ab6
Allow 'Cockney' filter to be translated.
...
Updates unit test.
Props miqrogroove.
Fixes #31953 .
Built from https://develop.svn.wordpress.org/trunk@32788
git-svn-id: http://core.svn.wordpress.org/trunk@32759 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-06-16 00:46:24 +00:00
Scott Taylor
b126a0144f
In the `youtube_embed_url` embed handler, make `embed` a non-capturing group that alternately matches for `v` - YouTube supports both URL paths.
...
Add unit test cases.
Props dmchale for some patch work.
Fixes #32161 .
Built from https://develop.svn.wordpress.org/trunk@32787
git-svn-id: http://core.svn.wordpress.org/trunk@32758 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-06-16 00:35:25 +00:00
Scott Taylor
d71d2c062e
In `get_comment_reply_link()`, when generating the reply link, add the `replytocom` query arg to the result of `get_permalink()` on the current `$post`, instead of the current global request URI.
...
Props nazmul.hossain.nihal.
Fixes #31333 .
Built from https://develop.svn.wordpress.org/trunk@32786
git-svn-id: http://core.svn.wordpress.org/trunk@32757 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-06-16 00:19:25 +00:00
Scott Taylor
b4f536eabe
Set `$_SERVER['REQUEST_METHOD']` for unit tests.
...
Props johnbillion.
Fixes #32636 .
Built from https://develop.svn.wordpress.org/trunk@32785
git-svn-id: http://core.svn.wordpress.org/trunk@32756 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-06-16 00:04:29 +00:00
Dion Hulse
faf6383ebd
Updates: Consistently use the same variable to refer to the plugin, avoids a potential PHP Notice when an external update script adds data without that key.
...
Props mordauk. Fixes #31784
Built from https://develop.svn.wordpress.org/trunk@32784
git-svn-id: http://core.svn.wordpress.org/trunk@32755 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-06-15 06:26:25 +00:00
Dion Hulse
c6bb637f89
Updats: Add a filter for the options params for the update being performed.
...
Props nofearinc. Fixes #27754
Built from https://develop.svn.wordpress.org/trunk@32783
git-svn-id: http://core.svn.wordpress.org/trunk@32754 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-06-15 05:35:26 +00:00
Dion Hulse
c726f72ea4
Updates: Allow the update row to include the active border styling post-ajax update.
...
Props TobiasBg. Fixes #32129
Built from https://develop.svn.wordpress.org/trunk@32782
git-svn-id: http://core.svn.wordpress.org/trunk@32753 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-06-15 05:13:25 +00:00
Dion Hulse
b881a541bb
Updates: Remove redundant title tags from update outputs.
...
Props afercia. Fixes #32530
Built from https://develop.svn.wordpress.org/trunk@32781
git-svn-id: http://core.svn.wordpress.org/trunk@32752 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-06-15 05:09:25 +00:00
Dion Hulse
629545aaf5
Updates: When an update fails (and it's not during the credential form) allow further updates to continue, with the assumption that the error only affects a single plugin.
...
Props magicroundabout. Fixes #32110 for trunk.
Built from https://develop.svn.wordpress.org/trunk@32780
git-svn-id: http://core.svn.wordpress.org/trunk@32751 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-06-15 04:28:25 +00:00
Dion Hulse
6eef8a8ff2
Updates: Display the failure reason in addition to 'Update Failed', allows for debugging by site owners.
...
Fixes #32435 , #32473
Built from https://develop.svn.wordpress.org/trunk@32779
git-svn-id: http://core.svn.wordpress.org/trunk@32750 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-06-15 03:48:28 +00:00
Dion Hulse
0eb8bfc464
Updates: When a error occurs during the connection phase, pass the error message back as the ajax failure message.
...
See #32435
Built from https://develop.svn.wordpress.org/trunk@32778
git-svn-id: http://core.svn.wordpress.org/trunk@32749 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-06-15 03:32:27 +00:00
Dion Hulse
04325cd834
Updates: Better handling when the credential form is long (such as when SSH is active). This adds scrolling to the dialogue, and hides the SSH-specific fields when not using the SSH handler.
...
See #32435
Built from https://develop.svn.wordpress.org/trunk@32777
git-svn-id: http://core.svn.wordpress.org/trunk@32748 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-06-15 03:20:28 +00:00
Dion Hulse
a4b4918377
Updates: When a connection failure occurs, and no credential form is present client side, allow it to fall through to the normal failure handlers.
...
See #32435
Built from https://develop.svn.wordpress.org/trunk@32776
git-svn-id: http://core.svn.wordpress.org/trunk@32747 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-06-15 02:48:28 +00:00
Jeremy Felt
947eef9468
Introduce get_main_network_id()
...
Expand on the logic previously available as part of `is_main_network()` and provide a way to obtain the ID of the main network. Most useful in multi-network configurations.
Props @johnjamesjacoby for the initial patch.
Fixes #30294 .
Built from https://develop.svn.wordpress.org/trunk@32775
git-svn-id: http://core.svn.wordpress.org/trunk@32746 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-06-14 21:45:25 +00:00
Helen Hou-Sandí
e3ae4f9d7e
Multisite: Use an email input for new user email address.
...
We also need to set novalidate on the form due to some browsers rejecting valid email addresses containing an IDN. We should holistically investigate whether this is still an issue in any major browsers at some point.
props earnjam.
fixes #32643 .
Built from https://develop.svn.wordpress.org/trunk@32774
git-svn-id: http://core.svn.wordpress.org/trunk@32745 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-06-14 20:41:27 +00:00
Andrew Nacin
a0f4e8e086
Media: Support title fields to be removed from attachments.
...
props antpb.
fixes #23932 .
Built from https://develop.svn.wordpress.org/trunk@32773
git-svn-id: http://core.svn.wordpress.org/trunk@32744 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-06-14 20:33:26 +00:00
Helen Hou-Sandí
ed46512c20
Reduce form spacing on narrower screens.
...
props liljimmi.
fixes #32489 , #32484 .
Built from https://develop.svn.wordpress.org/trunk@32772
git-svn-id: http://core.svn.wordpress.org/trunk@32743 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-06-14 20:12:26 +00:00
Andrew Nacin
748b3763cb
Add add_user_role and remove_user_role actions for WP_User::add_role() and remove_role().
...
props shooper.
fixes #32060 .
Built from https://develop.svn.wordpress.org/trunk@32771
git-svn-id: http://core.svn.wordpress.org/trunk@32742 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-06-14 19:26:25 +00:00
Aaron Jorbin
38d59c0828
Improve dbDelta unit tests
...
Add new tests for more parts of dbDelta. This was cleaned up and prepared for commit at #wcphilly contributor day.
Props jdgrimes, tryon, jtsternberg, ebinnion, JPry, avnarun, kevkoeh, jorbin, salcode.
Fixes #29020 .
Built from https://develop.svn.wordpress.org/trunk@32770
git-svn-id: http://core.svn.wordpress.org/trunk@32741 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-06-14 19:23:26 +00:00
Andrew Nacin
7080c8e24b
Update comment caches in WP_Comment_Query, rather than comments template.
...
props dd32.
fixes #31081 .
Built from https://develop.svn.wordpress.org/trunk@32769
git-svn-id: http://core.svn.wordpress.org/trunk@32740 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-06-14 19:21:25 +00:00
Andrew Nacin
e7f618d86e
Tweak the first post/page content to get with the times.
...
props chriscct7.
fixes #22474 .
Built from https://develop.svn.wordpress.org/trunk@32768
git-svn-id: http://core.svn.wordpress.org/trunk@32739 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-06-14 18:56:50 +00:00
Aaron Jorbin
36e593a46c
Restore [32732] as it wasn't the actual cause of test failures as those failures where fixed separately.
...
See #32732
Built from https://develop.svn.wordpress.org/trunk@32767
git-svn-id: http://core.svn.wordpress.org/trunk@32738 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-06-14 18:56:26 +00:00
Aaron Jorbin
3d2f8542ac
Revert [32732] since it is causing the tests to break
...
See #32732
Built from https://develop.svn.wordpress.org/trunk@32766
git-svn-id: http://core.svn.wordpress.org/trunk@32737 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-06-14 18:43:25 +00:00
Aaron Jorbin
cbb6f91a29
Improve lastBuildDate timestamp in rss feeds
...
RSS feed timestamps should reflect the actual timestamps for those RSS feeds rather than the generic timestamp for all posts and all comments.
Props stevenkword.
Fixes #4575 .
Built from https://develop.svn.wordpress.org/trunk@32765
git-svn-id: http://core.svn.wordpress.org/trunk@32736 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-06-14 18:37:24 +00:00
Dominik Schilling
df11970e18
Nav menus: Introduce a `wp_get_nav_menu_object` filter in `wp_get_nav_menu_object()` to filter the retrieved nav_menu term.
...
props westonruter.
fixes #32629 .
Built from https://develop.svn.wordpress.org/trunk@32764
git-svn-id: http://core.svn.wordpress.org/trunk@32735 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-06-14 17:37:25 +00:00
Dominik Schilling
8dcd236ba3
Nav menus: Reset the `fallback_cb` default argument in `wp_nav_menu` in case of a Customizer preview.
...
props westonruter.
see #32576 .
Built from https://develop.svn.wordpress.org/trunk@32763
git-svn-id: http://core.svn.wordpress.org/trunk@32734 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-06-14 17:14:24 +00:00
Dominik Schilling
55f3b68c75
Nav Menus: Update `wp_setup_nav_menu_item()` to stop overriding empty properties from supplied `$menu_item`.
...
Update docs for `WP_Post` constructor to indicate that `WP_Post|object` can be the supplied param, as opposed to just `WP_Post`.
props westonruter.
fixes #32632 .
Built from https://develop.svn.wordpress.org/trunk@32762
git-svn-id: http://core.svn.wordpress.org/trunk@32733 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-06-14 10:53:25 +00:00
Jeremy Felt
8daec04557
Remove a now unused `switch_to_blog()` and `restore_current_blog()` in site-info.php
...
Now that we decide when to automatically update `home` and `siteurl`, we no longer need to switch to the site while displaying the form output.
See #32503 .
Built from https://develop.svn.wordpress.org/trunk@32761
git-svn-id: http://core.svn.wordpress.org/trunk@32732 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-06-14 08:23:26 +00:00
Jeremy Felt
da35c25fb7
Remove the "Update siteurl and home as well" checkbox when editing a site
...
Rather than provide a checkbox to update the `siteurl` and `home` options, we can make an educated decision based on the current state. If the home and/or siteurl domain and path match the existing domain and path of the site, then we update with the new information.
Also, while scheme is not stored in `wp_blogs` along with a site, the scheme of the `home` and `siteurl` options can now be modified via the Site URL setting in `site-info.php` when the `home` and/or `siteurl` options match the existing domain.
Props @hugobaeta, @earnjam, @jeremyfelt.
Fixes #32503 , see #22383 .
Built from https://develop.svn.wordpress.org/trunk@32760
git-svn-id: http://core.svn.wordpress.org/trunk@32731 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-06-14 07:52:24 +00:00
Jeremy Felt
186c37a325
Capture domain and path when editing sites on a subdomain network
...
When a network is configured as subdomain, allow for the input of arbitrary domain and path combinations when editing a site rather than just the domain.
This takes a step or two toward #32503 .
Props @scribu, @ericlewis, @jeremyfelt.
See #22383 .
Built from https://develop.svn.wordpress.org/trunk@32759
git-svn-id: http://core.svn.wordpress.org/trunk@32730 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-06-14 07:09:25 +00:00
Jeremy Felt
f996e163b8
Improve code readability in site-info.php
...
In advance of some other work here, clean up some braces and spaces.
See #22383 .
Built from https://develop.svn.wordpress.org/trunk@32758
git-svn-id: http://core.svn.wordpress.org/trunk@32729 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-06-14 05:01:28 +00:00
Scott Taylor
4348074f3a
In `WP_MS_Users_List_Table::display_rows()`:
...
* Move the giant `switch` statement into methods
* Call `->single_row_columns()`, which we now override - there is a small amount of logic that requires overriding, otherwise it is largely the same as the parent method
See #29881 .
Built from https://develop.svn.wordpress.org/trunk@32757
git-svn-id: http://core.svn.wordpress.org/trunk@32728 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-06-13 17:11:26 +00:00
Scott Taylor
3855cfbffd
In `WP_MS_Themes_List_Table::display_rows()`:
...
* Move the giant `switch` statement into methods
* Call `->single_row_columns()`, which we now override
See #29881 .
Built from https://develop.svn.wordpress.org/trunk@32756
git-svn-id: http://core.svn.wordpress.org/trunk@32727 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-06-13 16:54:26 +00:00
Scott Taylor
2bdcc71bc0
In `WP_MS_Sites_List_Table::display_rows()`:
...
* Move the giant `switch` statement into methods
* Call `->single_row_columns()`, which we now override - it could inherit from `WP_List_Table` if we can find a way to handle the `id` column. When that happens, we can ditch this method.
See #29881 .
Built from https://develop.svn.wordpress.org/trunk@32755
git-svn-id: http://core.svn.wordpress.org/trunk@32726 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-06-13 16:23:25 +00:00