Commit Graph

32932 Commits

Author SHA1 Message Date
Jeremy Felt
6f2d676f76 Bump 4.4 branch to 4.4.5.
Built from https://develop.svn.wordpress.org/branches/4.4@38551


git-svn-id: http://core.svn.wordpress.org/branches/4.4@38494 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-09-07 14:58:58 +00:00
Jeremy Felt
b8e218019a Media: Sanitize upload filename.
Merge of [38538] to the 4.4 branch.

Built from https://develop.svn.wordpress.org/branches/4.4@38541


git-svn-id: http://core.svn.wordpress.org/branches/4.4@38484 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-09-07 13:58:28 +00:00
Pascal Birchler
48dad74eb6 Upgrade/Install: Sanitize file name in File_Upload_Upgrader.
Merge of [38524] to the 4.4 branch.
Built from https://develop.svn.wordpress.org/branches/4.4@38527


git-svn-id: http://core.svn.wordpress.org/branches/4.4@38468 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-09-06 17:49:40 +00:00
Gary Pendergast
c9fb1436ed Database: dbDelta() will no longer try to downgrade the size of TEXT and BLOB columns.
When upgrading to `utf8mb4`, `TEXT` fields will be upgraded to `MEDIUMTEXT` (and likewise for all other `*TEXT` and `*BLOB` fields). This is to allow for the additional space requirements of `utf8mb4`.

On the subsequent upgrade, `dbDelta()` would try and downgrade the fields to their original size again. At best, this it a waste of time, at worst, this could truncate any data larger than the original size. There's no harm in leaving them at their new size, so let's do that.

This also fixes a typo in the `dbDelta()` tests.

Merge of [37525] to the 4.4 branch.
Partial merge of [36552] to the 4.4 branch.

See #36748.


Built from https://develop.svn.wordpress.org/branches/4.4@37936


git-svn-id: http://core.svn.wordpress.org/branches/4.4@37877 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-07-01 07:00:50 +00:00
Gary Pendergast
1d21012923 The 4.4 branch is now 4.4.5-alpha.
Built from https://develop.svn.wordpress.org/branches/4.4@37935


git-svn-id: http://core.svn.wordpress.org/branches/4.4@37876 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-07-01 06:22:28 +00:00
Boone Gorges
74ef49671f Bump 4.4 branch to 4.4.4.
Built from https://develop.svn.wordpress.org/branches/4.4@37829


git-svn-id: http://core.svn.wordpress.org/branches/4.4@37794 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-06-21 16:21:26 +00:00
Joe McGill
f68837fd6f Media: Improve handling of extensionless filenames.
Merge of [37756] to the 4.4 branch.

See #37111.
Built from https://develop.svn.wordpress.org/branches/4.4@37810


git-svn-id: http://core.svn.wordpress.org/branches/4.4@37775 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-06-21 14:53:31 +00:00
Nikolay Bachiyski
bf3b6b800d Admin: escape URL-encoded permalinks
Merge of [37801] to the 4.4 branch.

Built from https://develop.svn.wordpress.org/branches/4.4@37807


git-svn-id: http://core.svn.wordpress.org/branches/4.4@37772 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-06-21 14:51:29 +00:00
Pascal Birchler
0a517e47ec Embeds: Improve performance when embedding a post from the current site.
When the post being embedded is from the same site, there's no reason to do an HTTP request for it. The data can be fetched directly using `get_oembed_response_data()`.

Merge of [37708], [37710] and [37729] to the 4.4 branch.

Fixes #36767.
Built from https://develop.svn.wordpress.org/branches/4.4@37798


git-svn-id: http://core.svn.wordpress.org/branches/4.4@37763 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-06-21 14:42:29 +00:00
Rachel Baker
2a00e5a736 Revisions: Change the capability needed to view revision diffs to edit_post.
Merge of [37779] to the 4.4 branch.
Built from https://develop.svn.wordpress.org/branches/4.4@37796


git-svn-id: http://core.svn.wordpress.org/branches/4.4@37761 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-06-21 14:32:27 +00:00
Nikolay Bachiyski
e22ceae1b7 Admin: Escape attachment name in case it contains special characters
Merge of [37774] to the 4.4 branch.

Built from https://develop.svn.wordpress.org/branches/4.4@37785


git-svn-id: http://core.svn.wordpress.org/branches/4.4@37750 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-06-21 14:24:27 +00:00
Dominik Schilling
30bb01b2e4 Customize: Make sure that preview and return URLs are URLs.
Merge of [37527] to the 4.4 branch.
Built from https://develop.svn.wordpress.org/branches/4.4@37769


git-svn-id: http://core.svn.wordpress.org/branches/4.4@37734 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-06-21 14:18:30 +00:00
Boone Gorges
7f84cb69ea Taxonomy: More specific cap check when processing category data on post save.
Ports [37691] to the 4.4 branch.

Props dlh.
Fixes #36379.
Built from https://develop.svn.wordpress.org/branches/4.4@37767


git-svn-id: http://core.svn.wordpress.org/branches/4.4@37732 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-06-21 14:16:28 +00:00
Jeremy Felt
a0f643da35 Admin: Allow for the consistent filtering of auth_redirect_scheme
Merge of [37651] to the 4.4 branch.

See #37047.

Built from https://develop.svn.wordpress.org/branches/4.4@37758


git-svn-id: http://core.svn.wordpress.org/branches/4.4@37723 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-06-21 14:11:28 +00:00
Dominik Schilling
90afd7e46c Bump 4.4 branch to 4.4.3.
Built from https://develop.svn.wordpress.org/branches/4.4@37385


git-svn-id: http://core.svn.wordpress.org/branches/4.4@37351 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-05-06 18:11:55 +00:00
Nikolay Bachiyski
f3907c1da9 External Libraries: Update plupload from upstream
Built from https://develop.svn.wordpress.org/branches/4.4@37381


git-svn-id: http://core.svn.wordpress.org/branches/4.4@37347 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-05-06 18:00:51 +00:00
Dominik Schilling
b1e244d828 External Libraries: Update MediaElement.js from upstream.
Merge of [37370] to the 4.4 branch.
Built from https://develop.svn.wordpress.org/branches/4.4@37372


git-svn-id: http://core.svn.wordpress.org/branches/4.4@37338 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-05-06 17:53:28 +00:00
Nikolay Bachiyski
b2fde3d346 4.4.3-RC1
Built from https://develop.svn.wordpress.org/branches/4.4@37149


git-svn-id: http://core.svn.wordpress.org/branches/4.4@37116 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-03-30 19:44:26 +00:00
Aaron Jorbin
940b403576 Remove Debugging code introduced in [37146]
Built from https://develop.svn.wordpress.org/branches/4.4@37147


git-svn-id: http://core.svn.wordpress.org/branches/4.4@37114 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-03-30 18:56:28 +00:00
Aaron Jorbin
9e1133b642 Add Nonce to updating wporg_favorites user meta field
Merges [37145] to the 4.4 branch

Built from https://develop.svn.wordpress.org/branches/4.4@37146


git-svn-id: http://core.svn.wordpress.org/branches/4.4@37113 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-03-30 18:41:26 +00:00
Nikolay Bachiyski
fc416c81fe Add nonce to AJAX action for script compression setting
Merges [37143] to the 4.4 branch

Built from https://develop.svn.wordpress.org/branches/4.4@37144


git-svn-id: http://core.svn.wordpress.org/branches/4.4@37111 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-03-30 18:31:28 +00:00
Nikolay Bachiyski
2c818e3fbd Taxonomies: make sure taxonomy functions work correctly with taxonomy names with special characters
The codex says that taxonomy names "should only contain lowercase letters and the underscore character", but that's not enforced. It's too late to enforce it, since some plugins haven't been following it and the official phpdoc doesn't mention this restriction.

Merge of [37133] to the 4.4 branch.

Built from https://develop.svn.wordpress.org/branches/4.4@37134


git-svn-id: http://core.svn.wordpress.org/branches/4.4@37101 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-03-30 17:17:28 +00:00
Jeremy Felt
89712c166d Multisite: Improve escaping in network settings.
Merge of [37124] to the 4.4 branch.

Built from https://develop.svn.wordpress.org/branches/4.4@37125


git-svn-id: http://core.svn.wordpress.org/branches/4.4@37092 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-03-30 16:01:27 +00:00
Dominik Schilling
434d135f12 HTTP: Improve detection of valid IP addresses.
Merge of [37115] to the 4.4 branch.
Built from https://develop.svn.wordpress.org/branches/4.4@37116


git-svn-id: http://core.svn.wordpress.org/branches/4.4@37083 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-03-30 15:51:26 +00:00
Dominik Schilling
4d66a3b242 Multisite: Validate new email address confirmations.
Merge of [37103] to the 4.4 branch.
Built from https://develop.svn.wordpress.org/branches/4.4@37104


git-svn-id: http://core.svn.wordpress.org/branches/4.4@37071 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-03-30 14:49:26 +00:00
Nikolay Bachiyski
e0cfe8655c Snoopy: use escapeshellarg instead of escapeshellcmd
We are escaping arguments, not commands, so we'd better use the semantically correct function, even though they are similar.

Built from https://develop.svn.wordpress.org/branches/4.4@37095


git-svn-id: http://core.svn.wordpress.org/branches/4.4@37062 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-03-30 14:03:28 +00:00
Pascal Birchler
eb51235b19 Embeds: Improve how iframes are loaded after being initially hidden.
Use a more accessible way to initially hide the iframe. After that, only display an iframe when it was successfully loaded.

Merge of [36648] and [36708] to the 4.4 branch.

Fixes #35894.
Built from https://develop.svn.wordpress.org/branches/4.4@37093


git-svn-id: http://core.svn.wordpress.org/branches/4.4@37060 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-03-30 10:57:27 +00:00
Gary Pendergast
3331f83d78 Emoji: Fix the diversity emoji check in Safari.
When the browser test for diversity emoji was added in [36160], it included a workaround for Chrome not being able to compare Uint8ClampedArray objects directly, by converting them to a string. Unfortunately, Safari doesn't support the Uint8ClampedArray.toString() method correctly, so the test was incorrectly failing in Safari.

Merge of [37028] to the 4.4 branch.

Fixes #36266.

Built from https://develop.svn.wordpress.org/branches/4.4@37090


git-svn-id: http://core.svn.wordpress.org/branches/4.4@37057 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-03-29 02:19:28 +00:00
Gary Pendergast
f9fa129053 Emoji: Add some extra IE11 compatibility.
IE 11's implementation of MutationObserver is buggy. It unnecessarily splits text nodes when it encounters a HTML template interpolation symbol ( "{{", for example ). So, we join the text nodes back together as a work-around.

Merge of [36817] and [36981] to the 4.4 branch.

Fixes #35977.


Built from https://develop.svn.wordpress.org/branches/4.4@37089


git-svn-id: http://core.svn.wordpress.org/branches/4.4@37056 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-03-29 02:02:51 +00:00
Boone Gorges
f2410b407d Query: Ignore search terms consisting of a single dash.
Due to the "exclude" support added in WP 4.4, single dashes were being
converted to "NOT LIKE '%%'" clauses, causing all searches to fail.

Ports [36989] to the 4.4 branch.

Props RomSocial, swissspidy.
Fixes #36195.

Built from https://develop.svn.wordpress.org/branches/4.4@37082


git-svn-id: http://core.svn.wordpress.org/branches/4.4@37049 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-03-25 18:41:27 +00:00
Sergey Biryukov
71788d7c89 Mail: Correct compact() usage in wp_mail().
Merges [36688] to the 4.4 branch.

Props Ankit K Gupta, maweder.
Fixes #35781.
Built from https://develop.svn.wordpress.org/branches/4.4@37081


git-svn-id: http://core.svn.wordpress.org/branches/4.4@37048 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-03-25 17:07:27 +00:00
Dominik Schilling
abae151cbd Bump 4.4 branch to 4.4.2.
Built from https://develop.svn.wordpress.org/branches/4.4@36455


git-svn-id: http://core.svn.wordpress.org/branches/4.4@36422 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-02-02 17:10:27 +00:00
Dominik Schilling
16414c4f90 Better validation of the URL used in HTTP redirects.
Merges [36444] to the 4.4 branch.
Built from https://develop.svn.wordpress.org/branches/4.4@36447


git-svn-id: http://core.svn.wordpress.org/branches/4.4@36414 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-02-02 16:59:28 +00:00
Dominik Schilling
59523c0dba HTTP: 0.1.2.3 is not a valid IP.
Merges [36435] to the 4.4 branch.
Built from https://develop.svn.wordpress.org/branches/4.4@36436


git-svn-id: http://core.svn.wordpress.org/branches/4.4@36403 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-02-02 13:03:28 +00:00
Dominik Schilling
ff833390f5 Bump 4.4 branch to 4.4.2-RC1.
Built from https://develop.svn.wordpress.org/branches/4.4@36431


git-svn-id: http://core.svn.wordpress.org/branches/4.4@36398 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-02-01 15:09:27 +00:00
Dominik Schilling
98b994303e Media: In wp_read_image_metadata() make sure that IPTC keywords are UTF8 encoded.
Prevents missing `_wp_attachment_metadata` when an image contains keywords with latin extended characters.

Merges [36429] to the 4.4 branch.
See #35316.
Built from https://develop.svn.wordpress.org/branches/4.4@36430


git-svn-id: http://core.svn.wordpress.org/branches/4.4@36397 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-02-01 14:58:28 +00:00
Dominik Schilling
9770d9e317 Emoji: Explicitly use https as the scheme for emoji fallback images, as they're only served over HTTPS by the CDN anyway.
Merges [36249] to the 4.4 branch.
See #35376.
Built from https://develop.svn.wordpress.org/branches/4.4@36428


git-svn-id: http://core.svn.wordpress.org/branches/4.4@36395 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-02-01 14:24:28 +00:00
Dominik Schilling
176d2efa1b Multisite: Add the global cache group networks to restore_current_blog().
Merges [36411] to the 4.4 branch.
See #35251.
Built from https://develop.svn.wordpress.org/branches/4.4@36412


git-svn-id: http://core.svn.wordpress.org/branches/4.4@36379 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-01-27 13:48:27 +00:00
Dion Hulse
487580f7c4 Emoji: Work around a mod_security rule which prevents pages with 4 or more instances of String.fromCharCode( from being served.
Merges [36359] to the 4.4 branch.
Fixes #35412.

Built from https://develop.svn.wordpress.org/branches/4.4@36410


git-svn-id: http://core.svn.wordpress.org/branches/4.4@36377 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-01-27 10:11:28 +00:00
Dion Hulse
46e43fdbb8 Add a commit number to the 4.4 branch so that branch nightly updates are automatically installed again.
Background Updates (even for development releases) don't install if `$wp_version == $offered_version`, without a commit number in `$wp_version` testers are forced to manually update.

Built from https://develop.svn.wordpress.org/branches/4.4@36378


git-svn-id: http://core.svn.wordpress.org/branches/4.4@36345 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-01-22 07:24:27 +00:00
Dominik Schilling
cf00f651b1 Widgets: Show the "Clear Inactive Widgets" button only after the sidebar with inactive widgets.
Merges [36326] to the 4.4 branch.
See #35447.
Built from https://develop.svn.wordpress.org/branches/4.4@36369


git-svn-id: http://core.svn.wordpress.org/branches/4.4@36336 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-01-20 21:57:28 +00:00
Dion Hulse
5daed64fde Customizer: Prevent erroneously directing user to login screen when closing.
Fixes issue where user gets stuck at login screen after trying to close the app if previously they had to first login to access the Customizer. Prevents `WP_Customize_Manager::get_return_url()` from using `wp-login.php` as a referer.

Merges [36261] to the 4.4 branch.
Props chandrapatel.
See #32637.
Fixes #35355.

Built from https://develop.svn.wordpress.org/branches/4.4@36363


git-svn-id: http://core.svn.wordpress.org/branches/4.4@36330 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-01-20 08:37:26 +00:00
Dion Hulse
7d81c464aa Comments: Ignore hierarchy in pagination calculation when comment threading is disabled.
In order to calculate comment pagination when newest comments are displayed
first, `comments_template()` must perform a separate query to determine the
total number of paginating comments available on a post. See [34729], #8071,
pagination calculation - can be defined as a top-level comment, or a comment
with `parent=0`. However, when comment threading is disabled, yet comments
exist in the database that have parents, all comments - even those with a
parent - are "paginating". (This typically happens when comments threading was
once enabled, but has since been turned off.) As such, the total-paginating-
comments query should only be limited to top-level comments when
'thread_comments' is disabled.

Merges [36275] to the 4.4 branch.
Props jmdodd.
Fixes #35419.

Built from https://develop.svn.wordpress.org/branches/4.4@36362


git-svn-id: http://core.svn.wordpress.org/branches/4.4@36329 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-01-20 08:32:27 +00:00
Dion Hulse
7baf5daba3 Comments: Respect all post-related filters in WP_Comment_Query.
The refactor of `WP_Comment_Query`'s SQL generation in [34542] introduced a bug
that caused only the last post-related filter to be respected in comment
queries. In other words, if querying for comments using params
`post_status=draft&post_author=3`, only the last-processed of these params
would be respected. The current changeset fixes the logic so that these clauses
don't overwrite each other.

Merges [36326] to the 4.4 branch.
Props chriscct7.
Fixes #35478.

Built from https://develop.svn.wordpress.org/branches/4.4@36361


git-svn-id: http://core.svn.wordpress.org/branches/4.4@36328 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-01-20 08:02:26 +00:00
Dion Hulse
6f9a213268 Comments: Respect custom pagination params when using wp_list_comments() in a query loop.
[36157] fixed a problem, introduced in 4.4, that caused custom pagination
parameters passed to `wp_list_comments()`. However, the fix introduced in that
changeset was limited to the `is_singular()` context, so that the bug remained
when `wp_list_comments()` is used within a non-singular `WP_Query` loop. We
fix this by removing the `is_singular()` check and using the more general
`get_the_ID()` to identify the correct post_id to use for the secondary
comment query.

Merges [36324] to the 4.4 branch.
Props boonebgorges.
Fixes #35402.

Built from https://develop.svn.wordpress.org/branches/4.4@36360


git-svn-id: http://core.svn.wordpress.org/branches/4.4@36327 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-01-20 07:59:25 +00:00
Dion Hulse
3131897233 Taxonomy: Populate term cache with proper clone of term objects.
[34999] modified the cache strategy for terms in the context of
`wp_get_object_terms()`. As part of these changes, the `object_id` property of
term objects had to be unset before being cached. To avoid modifying passed-by-
reference terms, `update_term_cache()` attempted to make a copy of the terms
passed to the function; however, it failed to use the `clone` keyword, and thus
only created a reference instead of a copy.

Merges [36323] to the 4.4 branch.
Props berengerzyla.
Fixes #35462.

Built from https://develop.svn.wordpress.org/branches/4.4@36358


git-svn-id: http://core.svn.wordpress.org/branches/4.4@36325 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-01-20 05:35:27 +00:00
Dion Hulse
d1c894df29 Comments: Use the post-filter WHERE clause when querying for comment descendants.
The descendant query in `WP_Comment_Query::fill_descendants()` uses the clauses
of the main `get_comment_ids()` query as a basis, discarding the `parent`,
`parent__in`, and `parent__not_in` clauses. As implemented in WP 4.4 [34546],
the WHERE clause was assembled in such a way that any modifications applied
using the `comments_clauses` filter were not inherited by `fill_descendants()`.
This resulted in descendant queries that did not always properly filter
results, and sometimes contained syntax errors.

The current changeset fixes the problem by using the post-filter WHERE clause
as the basis for the `fill_descendants()` query. This change requires a new
approach for eliminating the unneeded parent-related clauses: instead of
eliminating values in an associative array, we must use regular expressions.

Merges [36277] to the 4.4 branch.
Props boonebgorges, firebird75.
Fixes #35192.

Built from https://develop.svn.wordpress.org/branches/4.4@36357


git-svn-id: http://core.svn.wordpress.org/branches/4.4@36324 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-01-20 05:28:26 +00:00
Dion Hulse
a8e4c25622 Comments: Always respect $comments array passed to wp_list_comments().
[36157] fixed a bug whereby `wp_list_comments()` would not properly recognize
custom pagination arguments. See #35175. However, it inadvertently introduced
a bug that caused any `$comments` array explicitly passed to the function to be
ignored, when that array was accompanied by pagination arguments that differ
from those in `$wp_query`. We address this bug by moving the logic introduced
in [36157] inside a block that only fires when no `$comments` array has been
provided to the function.

Merges [36276] to the 4.4 branch.
Props ivankristianto, boonebgorges.
Fixes #35356.

Built from https://develop.svn.wordpress.org/branches/4.4@36356


git-svn-id: http://core.svn.wordpress.org/branches/4.4@36323 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-01-20 05:24:27 +00:00
Dion Hulse
347698ac3d Quick Edit: on the Taxonomies screens, prevent a page reload when pressing Enter on a focused field.
Merges [36260 to the 4.4 branch.
Props afercia.
Fixes #35401.

Built from https://develop.svn.wordpress.org/branches/4.4@36355


git-svn-id: http://core.svn.wordpress.org/branches/4.4@36322 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-01-20 04:41:27 +00:00
Dion Hulse
b2275a579b Query: Avoid invalid SQL when building ORDER BY clause using long search strings.
The introduction of negative search terms in 4.4 [34934] introduced the
possibility that the ORDER BY clause of a search query could be assembled in
such a way as to create invalid syntax. The current changeset fixes this by
ensuring that the ORDER BY clause corresponding to the search terms is
excluded when it would otherwise be empty.

Merges [36251] to the 4.4 branch.
Props salvoaranzulla, boonebgorges.
Fixes #35361.

Built from https://develop.svn.wordpress.org/branches/4.4@36354


git-svn-id: http://core.svn.wordpress.org/branches/4.4@36321 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-01-20 04:38:27 +00:00