5a8dc364d1
Fix a grammar error on Permalink Settings screen. props celloexpressions. fixes #25210 .
...
Built from https://develop.svn.wordpress.org/trunk@25206
git-svn-id: http://core.svn.wordpress.org/trunk@25178 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-09-02 10:04:10 +00:00
5f45d9b482
Use an array as a default value for $meta in multisite signup-related functions. fixes #25149 .
...
Built from https://develop.svn.wordpress.org/trunk@25205
git-svn-id: http://core.svn.wordpress.org/trunk@25177 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-09-02 03:33:09 +00:00
6760d294bb
Update phpdoc for get_user_to_edit(), get_userdata(), and get_user_by(). props tivnet. fixes #24992 .
...
Built from https://develop.svn.wordpress.org/trunk@25204
git-svn-id: http://core.svn.wordpress.org/trunk@25176 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-09-02 03:25:09 +00:00
b1dc91c447
Clear 'default_password_nag' flag when resetting a user's password, since the new password is entered manually. props wikicms. fixes #25206 .
...
Built from https://develop.svn.wordpress.org/trunk@25203
git-svn-id: http://core.svn.wordpress.org/trunk@25175 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-09-02 03:18:10 +00:00
259ee74782
Prevent WP_Styles::do_item() from adding its own style tags when concatenation is disabled. props stephenharris. fixes #24813 .
...
Built from https://develop.svn.wordpress.org/trunk@25202
git-svn-id: http://core.svn.wordpress.org/trunk@25174 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-09-01 13:15:09 +00:00
00c9232a19
Move get_real_file_to_edit() to wp-admin/includes/deprecated.php. props iamfriendly. fixes #23680 .
...
Built from https://develop.svn.wordpress.org/trunk@25201
git-svn-id: http://core.svn.wordpress.org/trunk@25173 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-09-01 12:37:12 +00:00
f50b7ff4c7
Remove the banner when concatenating TinyMCE so wp-tinymce.js.gz doesn't change every time the build process is run. See #25159 .
...
Built from https://develop.svn.wordpress.org/trunk@25200
git-svn-id: http://core.svn.wordpress.org/trunk@25172 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-08-31 22:02:10 +00:00
3615a566b7
Update tests/README.txt to reflect the new tests directory structure. props jdgrimes. fixes #25133 .
...
Built from https://develop.svn.wordpress.org/trunk@25199
git-svn-id: http://core.svn.wordpress.org/trunk@25171 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-08-31 13:43:10 +00:00
7a8981a38c
Case insensitivity for is_email_address_unsafe().
...
props jkudish.
fixes #25046 .
Built from https://develop.svn.wordpress.org/trunk@25197
git-svn-id: http://core.svn.wordpress.org/trunk@25169 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-08-31 04:36:10 +00:00
0d9fcbd841
Use get_nav_menu_locations() in wp_delete_nav_menu().
...
props nofearinc.
see #25064 .
Built from https://develop.svn.wordpress.org/trunk@25196
git-svn-id: http://core.svn.wordpress.org/trunk@25168 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-08-31 01:39:09 +00:00
8e56222a1a
Nav menus: Allow assigning a new menu to an existing location when no theme setting is currently saved.
...
props ocean90.
see #25064 , for trunk.
Built from https://develop.svn.wordpress.org/trunk@25195
git-svn-id: http://core.svn.wordpress.org/trunk@25167 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-08-31 01:37:08 +00:00
1ef62770d2
Remove display of 'Previously restored by' in the revisions meta box as it is busted.
...
Fixes invalid markup (missing closing ul tag) when there was no previously restored revision.
see #25051 for trunk.
Built from https://develop.svn.wordpress.org/trunk@25194
git-svn-id: http://core.svn.wordpress.org/trunk@25166 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-08-31 01:33:09 +00:00
e0d60de6ca
Fix 'html5' theme support.
...
* Require it to have a second argument when adding.
* Merge, rather than replace, on second add.
* Make current_theme_supports() work when two arguments are passed.
Adds unit tests.
props nathanrice for initial patch.
see #24932 for trunk.
Built from https://develop.svn.wordpress.org/trunk@25193
git-svn-id: http://core.svn.wordpress.org/trunk@25165 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-08-31 01:30:09 +00:00
0496b1acfd
Hide 'Database Upgrade Required' on admin/network/upgrade.php when you are not being asked to upgrade, to prevent confusion.
...
props duck_.
see #24845 . see #23540 .
Built from https://develop.svn.wordpress.org/trunk@25191
git-svn-id: http://core.svn.wordpress.org/trunk@25163 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-08-31 00:57:10 +00:00
6a1ac52330
Be less verbose when erroring out in do_feed() for an invalid feed template. fixes #24874 .
...
Built from https://develop.svn.wordpress.org/trunk@25190
git-svn-id: http://core.svn.wordpress.org/trunk@25162 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-08-30 23:37:11 +00:00
043bb44747
Remove wp-tinymce.js.gz from develop.svn, as this is now part of the build process.
...
see #25159 and [25188].
Built from https://develop.svn.wordpress.org/trunk@25189
git-svn-id: http://core.svn.wordpress.org/trunk@25161 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-08-30 22:25:08 +00:00
2356b54f7e
Build tinymce.js.gz using grunt.
...
props azaozz.
see #25159 .
Built from https://develop.svn.wordpress.org/trunk@25188
git-svn-id: http://core.svn.wordpress.org/trunk@25160 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-08-30 22:17:15 +00:00
cd4d1460c6
Fix folding/unfolding of the admin menu on new installs, props SergeyBiryukov, fixes #24921 for 3.6.1.
...
Built from https://develop.svn.wordpress.org/trunk@25186
git-svn-id: http://core.svn.wordpress.org/trunk@25158 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-08-30 17:11:08 +00:00
5a312f71f6
Revert [23307] so new users in multisite are not automatically subscribers on the main site.
...
props duck_.
fixes #25166 for trunk.
see #15627 .
Built from https://develop.svn.wordpress.org/trunk@25183
git-svn-id: http://core.svn.wordpress.org/trunk@25155 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-08-30 16:29:12 +00:00
93b2edbbba
Correct rewrite tag for hierarchical post types without a query_var.
...
Hierarchical rewrite rules operate via the 'pagename' query variable which is
passed to get_page_by_path(). However, the current rewrite rules use the 'name'
query variable for hierarchical types without a custom query_var.
Fixes #16323 .
Built from https://develop.svn.wordpress.org/trunk@25182
git-svn-id: http://core.svn.wordpress.org/trunk@25154 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-08-30 08:08:09 +00:00
d221f04e60
Plugin Upgrader: Plugin_Upgrader::upgrade() returns nothing in event of success, every other install(), upgrade() and bulk_upgrade() method returns true, so return true;
...
Built from https://develop.svn.wordpress.org/trunk@25181
git-svn-id: http://core.svn.wordpress.org/trunk@25153 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-08-30 07:38:09 +00:00
d3bd82f0ac
Theme Upgrader: Be super-careful and check the contents of the $wp_theme_directories variable before merging it, if someone has changed it directly, or worse, unset it, this could've resulted in the $protected_directories being empty. See [25082] See #22501
...
Built from https://develop.svn.wordpress.org/trunk@25180
git-svn-id: http://core.svn.wordpress.org/trunk@25152 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-08-30 07:35:09 +00:00
af70c14d6d
Add signup_id primary key to $wpdb->signups, and add better indexes.
...
props josephscott, pento, barry.
see #15004 .
Built from https://develop.svn.wordpress.org/trunk@25179
git-svn-id: http://core.svn.wordpress.org/trunk@25151 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-08-30 04:30:08 +00:00
cbad0048a4
Don't set up $post_author_data in map_meta_cap() as we don't need it.
...
props duck_.
fixes #25177 .
Built from https://develop.svn.wordpress.org/trunk@25177
git-svn-id: http://core.svn.wordpress.org/trunk@25150 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-08-30 04:01:08 +00:00
994033258e
WP_HTTP: Make the new 2nd parameter to WP_HTP::processHeaders() as optional. See #21182 . Fixes #25179
...
Built from https://develop.svn.wordpress.org/trunk@25176
git-svn-id: http://core.svn.wordpress.org/trunk@25149 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-08-30 02:11:09 +00:00
cf02025fe0
Check for a WP_Error return from wp_create_user() in register_new_user().
...
props coffee2code.
fixes #14290 .
Built from https://develop.svn.wordpress.org/trunk@25174
git-svn-id: http://core.svn.wordpress.org/trunk@25148 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-08-29 22:16:09 +00:00
cb154ad4f5
Move wp-config-sample.php to the root of develop.svn.
...
wp-config.php is now created in the root. wp-config-sample.php is properly copied over to the build directory for syncing to core.svn.
Add some ignores.
fixes #25185 , see #24976 .
Built from https://develop.svn.wordpress.org/trunk@25173
git-svn-id: http://core.svn.wordpress.org/trunk@25147 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-08-29 20:46:09 +00:00
f16aee063e
Avoid validating wildcard hostnames in populate_network() when multisite is already activated.
...
props jeremyfelt.
fixes #25182 .
Built from https://develop.svn.wordpress.org/trunk@25171
git-svn-id: http://core.svn.wordpress.org/trunk@25146 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-08-29 19:31:09 +00:00
7c1ea6c95c
No need to re-map the return values of `wp_parse_id_list()` to int.
...
See #22074 , #11823 .
Built from https://develop.svn.wordpress.org/trunk@25169
git-svn-id: http://core.svn.wordpress.org/trunk@25145 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-08-29 18:54:09 +00:00
0624fe960b
Improve the include / exclude SQL generation in `get_pages()` by using `IN` and `NOT IN` where applicable. Adds unit tests for include / exclude.
...
Fixes #22074 .
Built from https://develop.svn.wordpress.org/trunk@25168
git-svn-id: http://core.svn.wordpress.org/trunk@25144 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-08-29 18:49:09 +00:00
29952baa41
Search term `name` and `slug` when the `search` arg is passed to `get_terms()`. Adds unit test.
...
Props wojtek.szkutnik.
Fixes #13992 .
Built from https://develop.svn.wordpress.org/trunk@25164
git-svn-id: http://core.svn.wordpress.org/trunk@25143 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-08-29 16:50:09 +00:00
eeb3b15936
Pass the taxonomy around to relevant nav menu actions to avoid arbitrarily deleting all items with `menu-item-type` of `taxonomy`. Adds unit test for `wp_get_associated_nav_menu_items()`.
...
Props garyc40, SergeyBiryukov.
Fixes #15264 .
Built from https://develop.svn.wordpress.org/trunk@25163
git-svn-id: http://core.svn.wordpress.org/trunk@25142 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-08-29 16:45:10 +00:00
4b449d38b4
Improve the include / exclude SQL generation in `get_terms()` by using `IN` and `NOT IN` where applicable. Adds unit tests for include / exclude.
...
Props sirzooro, duck_.
Fixes #11823 .
Built from https://develop.svn.wordpress.org/trunk@25162
git-svn-id: http://core.svn.wordpress.org/trunk@25141 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-08-29 16:24:09 +00:00
2f2f50c659
Support `id=>name` and `id=>slug` values for `fields` arg in `get_terms()`. Adds unit tests.
...
Props mikeschinkel.
Fixes #13661 .
Built from https://develop.svn.wordpress.org/trunk@25161
git-svn-id: http://core.svn.wordpress.org/trunk@25140 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-08-29 15:19:10 +00:00
8e6abf65a8
Respect the `fields` arg when passed to `get_children()`.
...
Fixes #22208 .
Built from https://develop.svn.wordpress.org/trunk@25160
git-svn-id: http://core.svn.wordpress.org/trunk@25139 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-08-29 15:08:12 +00:00
5073ad5776
zxcvbn: Apply ROT13 when building the dynamic user_inputs dictionary.
...
The modified matcher assumes that the dictionaries are ROT13 encoded.
All of the static dictionaries were, but user_inputs wasn't. See #21737 .
Built from https://develop.svn.wordpress.org/trunk@25159
git-svn-id: http://core.svn.wordpress.org/trunk@25138 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-08-29 08:41:08 +00:00
63568b0b61
Return to 'Item' for term updated messages for the link_category taxonomy.
...
props SergeyBiryukov, pavelevap.
fixes #18714 .
Built from https://develop.svn.wordpress.org/trunk@25158
git-svn-id: http://core.svn.wordpress.org/trunk@25137 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-08-28 18:59:09 +00:00
09e92faa6c
Use Dropbox's zxcvbn library for our password meter.
...
The library was added in [25156].
props duck_.
see #21737 .
Built from https://develop.svn.wordpress.org/trunk@25157
git-svn-id: http://core.svn.wordpress.org/trunk@25136 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-08-28 16:09:10 +00:00
1370cf9a7b
Add Dropbox's zxcvbn library for realistic password strength estimation.
...
Upstream: https://github.com/lowe/zxcvbn . MIT License.
Modified for WordPress with a rot13 of the included word dictionaries, for PG-ness.
props duck_.
see #21737 .
Built from https://develop.svn.wordpress.org/trunk@25156
git-svn-id: http://core.svn.wordpress.org/trunk@25135 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-08-28 16:03:11 +00:00
f17254a835
WP_HTTP: Fix a variable typo in [25153] See #23463
...
Built from https://develop.svn.wordpress.org/trunk@25155
git-svn-id: http://core.svn.wordpress.org/trunk@25134 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-08-28 07:30:08 +00:00
5a9ccf9bee
WP_HTTP: Update the documentation regarding HTTP/1.1 support. Props leewillis77 Fixes #25074
...
Built from https://develop.svn.wordpress.org/trunk@25154
git-svn-id: http://core.svn.wordpress.org/trunk@25133 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-08-28 06:55:09 +00:00
122c3953d1
WP_HTTP: Improve WP_HTTP::chunkTransferDecode() to properly handle binary data and chunked responses which include data in the page that looks like a chunked response.
...
This also fixes a case where the gzip'd data would become corrupt after chunked decoding as \r\n was replaced with \n in the data stream. Fixes #23463
Built from https://develop.svn.wordpress.org/trunk@25153
git-svn-id: http://core.svn.wordpress.org/trunk@25132 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-08-28 06:53:09 +00:00
9e9b9b5508
Make sure $args is an array before treating it as such. fixes #25151 for trunk.
...
Built from https://develop.svn.wordpress.org/trunk@25151
git-svn-id: http://core.svn.wordpress.org/trunk@25130 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-08-28 05:28:09 +00:00
1aecc6c957
WP_HTTP: When requesting a document with HTTP/1.1 include the 'Connection: Close' header (unless a Connection header is already specified) to prevent the connection being held open and hanging the request process. See #23463
...
Built from https://develop.svn.wordpress.org/trunk@25150
git-svn-id: http://core.svn.wordpress.org/trunk@25129 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-08-28 04:59:09 +00:00
f8e3be14fe
WP_HTTP: More relaxed host matching for WP_PROXY_BYPASS_HOSTS and WP_ACCESSIBLE_HOSTS, allowing for subdomains in wildcards to include dashes (and anything else which [\w.] didn't catch). Fixes #24201
...
Built from https://develop.svn.wordpress.org/trunk@25149
git-svn-id: http://core.svn.wordpress.org/trunk@25128 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-08-28 04:54:09 +00:00
1fbc03a388
The main site of a secondary network should not use the original wp-content/uploads upload path.
...
props jeremyfelt.
fixes #25030 .
Built from https://develop.svn.wordpress.org/trunk@25148
git-svn-id: http://core.svn.wordpress.org/trunk@25127 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-08-28 03:36:09 +00:00
4d6d80a14f
Introduce is_main_network().
...
By default, a network ID of 1 is assumed to be the main network.
Otherwise, it is the first network listed in the wp_site table.
If PRIMARY_NETWORK_ID is defined, it is considered main network.
props jeremyfelt.
see #25030 .
Built from https://develop.svn.wordpress.org/trunk@25147
git-svn-id: http://core.svn.wordpress.org/trunk@25126 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-08-28 03:35:08 +00:00
8a50bf2f14
Use a better variable name in antispambot() introduced with [25055]. Props duck_ Fixes #16754
...
Built from https://develop.svn.wordpress.org/trunk@25146
git-svn-id: http://core.svn.wordpress.org/trunk@25125 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-08-28 01:47:09 +00:00
1eb25761ee
Replace duplicated lines in [25143] with an assignment. see #18714 .
...
Built from https://develop.svn.wordpress.org/trunk@25144
git-svn-id: http://core.svn.wordpress.org/trunk@25124 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-08-27 21:25:09 +00:00
737330ac4b
Add a terms_updated_messages filter to edit-tags.php, along with taxonomy-specific strings.
...
props johnbillion.
fixes #18714 .
Built from https://develop.svn.wordpress.org/trunk@25143
git-svn-id: http://core.svn.wordpress.org/trunk@25123 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-08-27 21:13:08 +00:00
Sergey Biryukov
Andrew Ozz
Andrew Nacin
Jon Cave
Dion Hulse
Scott Taylor
Dominik Schilling