Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-11-20 01:25:30 +01:00
Code Issues Projects Releases Wiki Activity
29,286 Commits 50 Branches 748 Tags 793 MiB
31c11b1f0d
Commit Graph

29286 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Boone Gorges
650ca95b95 In wp_insert_term(), allow a term with an existing name if a unique $slug has been provided. 
`wp_insert_term()` protects against the creation of terms with duplicate names
at the same level of a taxonomy hierarchy. However, it's historically been
possible to override this protection by explicitly providing a value of `$slug`
that is unique at the hierarchy tier. This ability was broken in [31734], and
the current changeset restores the original behavior.

A number of unit tests are added and refactored in support of these changes.

See #17689 for discussion of a fix that was superceded by [31734]. This commit
retains the fix for the underlying bug described in that ticket.

See #31328.
Built from https://develop.svn.wordpress.org/trunk@31792


git-svn-id: http://core.svn.wordpress.org/trunk@31774 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-03-16 11:16:28 +00:00
Gary Pendergast
a97462e755 Emoji: Rename the email and feed filter functions to be _ prefixed, and @ignore-d in the PHPDocs. 
See #31242


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


git-svn-id: http://core.svn.wordpress.org/trunk@31773 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-03-16 10:46:26 +00:00
Sergey Biryukov
756e445a53 Fix typo in a comment in [31752]. 
see #31242.
Built from https://develop.svn.wordpress.org/trunk@31790


git-svn-id: http://core.svn.wordpress.org/trunk@31770 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-03-16 01:56:27 +00:00
Drew Jaynes
f50307c5d8 Clean up some inline documentation for emoji functionality, including a missing @since for mail_emoji(), and a changelog entry for wp_insert_post(). 
See #31242.

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


git-svn-id: http://core.svn.wordpress.org/trunk@31769 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-03-16 01:43:28 +00:00
Gary Pendergast
faac51cad0 Emoji: Move a comment to match the restructure in [31779], and add an extra comment explaining how emoji rendering support is detected. 
See #31242


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


git-svn-id: http://core.svn.wordpress.org/trunk@31768 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-03-16 00:06:28 +00:00
Andrew Ozz
c18ef513a0 Emoji: fix few typos. See #31242. 
Built from https://develop.svn.wordpress.org/trunk@31787


git-svn-id: http://core.svn.wordpress.org/trunk@31767 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-03-15 23:29:26 +00:00
Andrew Ozz
a7fd4a3774 Emoji: 
- Add the styling for the replacement images to the admin CSS.
- Revert to using `.emoji` as replacement image class.
- When pasting in the editor, convert emoji images to our format so we can replace them with chars on saving.
- Some more clean up of both the plugin and wp-emoji.js.
See #31242.
Built from https://develop.svn.wordpress.org/trunk@31786


git-svn-id: http://core.svn.wordpress.org/trunk@31766 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-03-15 23:16:29 +00:00
Lance Willett
c0c8c61d26 Twenty Thirteen: add ARIA attributes to menu toggle. See #31527. 
Built from https://develop.svn.wordpress.org/trunk@31785


git-svn-id: http://core.svn.wordpress.org/trunk@31765 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-03-15 20:01:26 +00:00
Lance Willett
f81f253434 Twenty Fourteen: add ARIA attributes to menu toggle. See #31527. 
Built from https://develop.svn.wordpress.org/trunk@31784


git-svn-id: http://core.svn.wordpress.org/trunk@31764 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-03-15 20:00:27 +00:00
Gary Pendergast
8c7ffba3b2 WPDB: HHVM doesn't support passing a DB link to mysqli_get_client_version(). While we usually pass a DB link to every ext/mysql and mysqli function call, we don't really need to do that here, as there's no way for the client library to change mid page load. 
Another fun fact is that `mysql_get_client_version()` doesn't exist, but `mysql_get_client_info()` (along with `mysqli_get_client_info()') do. So, we're switching to them, in order to add a pleasing symmetry to the client version check.

Fixes #31644


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


git-svn-id: http://core.svn.wordpress.org/trunk@31763 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-03-15 12:20:26 +00:00
Gary Pendergast
33c785e021 Tests: Since [31733], we now encode emoji in posts, instead of removing them (when they're being stored in versions of MySQL that don't support utf8mb4). 
Built from https://develop.svn.wordpress.org/trunk@31782


git-svn-id: http://core.svn.wordpress.org/trunk@31762 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-03-15 11:51:26 +00:00
Gary Pendergast
ac61ac62cd Smilies: The new smilies added in [31733] and [31745] are larger than the old smilies. While this is taken care of by the CSS on normal pages, it means they're disproportionally large when seen in RSS and email. 
By adding a little bit of inline style to them, we get pleasingly sized smilies everywhere. :-)

See #31242


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


git-svn-id: http://core.svn.wordpress.org/trunk@31761 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-03-15 11:41:27 +00:00
Andrew Ozz
1fc8c98fd7 Emoji: always export the methods in wp-emoji.js, even when dependencies are missing and we cannot initialize. 
See #31242.
Built from https://develop.svn.wordpress.org/trunk@31780


git-svn-id: http://core.svn.wordpress.org/trunk@31760 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-03-15 00:17:27 +00:00
Andrew Ozz
8a402aa701 Emoji: 
- Move the TinyMCE plugin CSS to wp-content.css.
- Change the replacement images class to `wp-emoji` inside the editor.
- Clean up both the plugin and wp-emoji.js, abstract and restructure a bit.
See #31242.
Built from https://develop.svn.wordpress.org/trunk@31779


git-svn-id: http://core.svn.wordpress.org/trunk@31759 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-03-14 23:49:30 +00:00
Andrew Ozz
ed7f297579 PressThis: increase the number of meta tags we check in the bookmarklet to 200. Sometimes there are empty meta tag nodes (no attributes) in some browsers. 
See #31373.
Built from https://develop.svn.wordpress.org/trunk@31778


git-svn-id: http://core.svn.wordpress.org/trunk@31758 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-03-14 20:12:34 +00:00
Sergey Biryukov
2c98f83b70 Remove duplicate label on Add New User screen. 
props abhishekfdd.
fixes #31131.
Built from https://develop.svn.wordpress.org/trunk@31777


git-svn-id: http://core.svn.wordpress.org/trunk@31757 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-03-14 01:04:27 +00:00
Sergey Biryukov
bc54c02021 Remove hidden user_id input from Edit Comment screen. 
Since [31172], it caused the comment's `user_id` field to be unexpectedly changed to the user who edits the comment.

fixes #30307.
Built from https://develop.svn.wordpress.org/trunk@31776


git-svn-id: http://core.svn.wordpress.org/trunk@31756 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-03-14 00:53:27 +00:00
Andrew Ozz
634df7e4a4 PressThis: add a wrapped with role = application to the categories section. 
Props: afercia. See #31443.
Built from https://develop.svn.wordpress.org/trunk@31775


git-svn-id: http://core.svn.wordpress.org/trunk@31755 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-03-13 23:41:27 +00:00
Andrew Ozz
a4d4c9f82a PressThis: in Grunt, minify the bookmarklet before copying the files to /build. 
See #31373.
Built from https://develop.svn.wordpress.org/trunk@31774


git-svn-id: http://core.svn.wordpress.org/trunk@31754 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-03-13 21:09:26 +00:00
Andrew Ozz
9ef1e2fb2a Emoji: yet another update for Twemoji, to 1.3.2. Props iseulde. See #31242. 
Built from https://develop.svn.wordpress.org/trunk@31773


git-svn-id: http://core.svn.wordpress.org/trunk@31753 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-03-13 20:30:27 +00:00
Andrew Ozz
c8129335b5 Emoji: better regex when testing for only char emoji. Props iseulde. See #31242. 
Built from https://develop.svn.wordpress.org/trunk@31772


git-svn-id: http://core.svn.wordpress.org/trunk@31752 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-03-13 20:27:26 +00:00
Sergey Biryukov
ac90f66250 Emoji and smiley images should be displayed inline. 
see #31242.
Built from https://develop.svn.wordpress.org/trunk@31771


git-svn-id: http://core.svn.wordpress.org/trunk@31751 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-03-13 18:45:27 +00:00
Sergey Biryukov
a1fb0a378c Restore line breaks before comment text in comment notification emails. 
fixes #31508.
Built from https://develop.svn.wordpress.org/trunk@31770


git-svn-id: http://core.svn.wordpress.org/trunk@31750 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-03-13 18:29:27 +00:00
Sergey Biryukov
a956c2798d Ignore .DS_Store files. 
props danielbachhuber.
fixes #31633.
Built from https://develop.svn.wordpress.org/trunk@31769


git-svn-id: http://core.svn.wordpress.org/trunk@31749 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-03-13 18:12:27 +00:00
Andrew Ozz
5080f1e3af PressThis: improve translatable strings on the Tools screen. 
Props: afercia. See #28873.
Built from https://develop.svn.wordpress.org/trunk@31768


git-svn-id: http://core.svn.wordpress.org/trunk@31748 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-03-13 17:31:28 +00:00
Drew Jaynes
79979c27c2 Post 4.2-beta1 version bump. 
Built from https://develop.svn.wordpress.org/trunk@31767


git-svn-id: http://core.svn.wordpress.org/trunk@31747 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-03-13 17:26:27 +00:00
Andrew Ozz
69c08b1b65 Emoji: update Twemoji to 1.3.1. Props iseulde. See #31242. 
Built from https://develop.svn.wordpress.org/trunk@31766


git-svn-id: http://core.svn.wordpress.org/trunk@31746 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-03-13 17:20:26 +00:00
Andrew Ozz
805c530cf0 PressThis: simplify and restyle the categories drop-down, remove the checkboxes and use JS to get the selected categories on submitting the form. 
Part prop: Michael-Arestad. Fixes #31443.
Built from https://develop.svn.wordpress.org/trunk@31765


git-svn-id: http://core.svn.wordpress.org/trunk@31745 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-03-13 16:57:26 +00:00
Drew Jaynes
f02e801045 WordPress 4.2-beta1 
Built from https://develop.svn.wordpress.org/trunk@31763


git-svn-id: http://core.svn.wordpress.org/trunk@31744 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-03-12 23:11:28 +00:00
Andrew Ozz
731f7c500d TinyMCE: fix emoji parsing in IE typo. See #31242. 
Built from https://develop.svn.wordpress.org/trunk@31762


git-svn-id: http://core.svn.wordpress.org/trunk@31743 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-03-12 23:03:26 +00:00
Andrew Ozz
b20119d92f TinyMCE: fix emoji parsing in IE. See #31242. 
Built from https://develop.svn.wordpress.org/trunk@31761


git-svn-id: http://core.svn.wordpress.org/trunk@31742 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-03-12 23:00:27 +00:00
Drew Jaynes
b2dbe2080f WordPress 4.2-beta1 
Built from https://develop.svn.wordpress.org/trunk@31760


git-svn-id: http://core.svn.wordpress.org/trunk@31741 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-03-12 22:50:27 +00:00
Dominik Schilling
6b01aa3a4f grunt imageminfor [31745]. 
see #31242.
Built from https://develop.svn.wordpress.org/trunk@31759


git-svn-id: http://core.svn.wordpress.org/trunk@31740 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-03-12 22:01:26 +00:00
Dominik Schilling
8fc889b2da Update Twemoji to 1.3.0. 
Includes a fix for Firefox: 92d5bea1ab
Since this fix breaks IE 11 we added `modified = false;` after `subnode.parentNode.replaceChild(fragment, subnode)`.

props iseulde.
see #31242.
Built from https://develop.svn.wordpress.org/trunk@31758


git-svn-id: http://core.svn.wordpress.org/trunk@31739 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-03-12 22:00:28 +00:00
Andrew Ozz
036f131b14 TinyMCE wpViews: fix typos in the conditional checking which stylesheets to import. 
Props mattheu. See #31464.
Built from https://develop.svn.wordpress.org/trunk@31757


git-svn-id: http://core.svn.wordpress.org/trunk@31738 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-03-12 20:08:27 +00:00
Andrew Ozz
e7131def4d Emoji: 
- Patch twemoji.js to prevent infinite loop.
- Fix some `undefined` errors in old IE.
Props iseulde. See #31242.
Built from https://develop.svn.wordpress.org/trunk@31756


git-svn-id: http://core.svn.wordpress.org/trunk@31737 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-03-12 19:53:26 +00:00
Dominik Schilling
474f001c42 Revert [31749], see #31528. 
Built from https://develop.svn.wordpress.org/trunk@31755


git-svn-id: http://core.svn.wordpress.org/trunk@31736 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-03-12 17:51:26 +00:00
Helen Hou-Sandí
798abe9f78 Allow is_page_template() to accept an array, as many other conditional tags do. 
props morganestes, tyxla, DrewAPicture.
fixes #31271.

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


git-svn-id: http://core.svn.wordpress.org/trunk@31735 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-03-12 16:28:27 +00:00
Sergey Biryukov
5c9656393a Shiny Updates: Disable body scrolling when filesystem request modal is open. 
props ericlewis.
fixes #31607.
Built from https://develop.svn.wordpress.org/trunk@31753


git-svn-id: http://core.svn.wordpress.org/trunk@31734 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-03-12 14:57:26 +00:00
Gary Pendergast
351ea2d6f8 Emoji: There's a little tear in my eye as I remove DOMDocument from the Emoji staticizer. It was a beautiful dream, but it wasn't to be. 
Instead, let's use the tried and trusted smiley replacement algorithm, which has stood the test of time.

See #31242


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


git-svn-id: http://core.svn.wordpress.org/trunk@31733 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-03-12 13:17:26 +00:00
Sergey Biryukov
e8a600ac94 Shiny Updates: Don't translate an error code string. 
props ericlewis.
fixes #31606.
Built from https://develop.svn.wordpress.org/trunk@31751


git-svn-id: http://core.svn.wordpress.org/trunk@31732 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-03-12 13:09:27 +00:00
Gary Pendergast
b7546d798f Emoji: Instead of having custom hooks for Ajax callbacks, use MutationObserver to re-parse any changed elements in the DOM. 
Props iseulde

See #31242


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


git-svn-id: http://core.svn.wordpress.org/trunk@31731 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-03-12 12:52:26 +00:00
Aaron Jorbin
5b658df402 Request FTP and SSH credentials when needed during shiny updates 
This is a first pass at requesting FTP and SSH credentials when needed during shiny updates. Styling and some UX improvements are still needed, but we do show the prompt and use the passed data when doing plugin installs and updates for shiny updates.  There are also a couple of areas that we could improve code wise such how we create the requestFilesystemCredentials part of the localized _wpUpdatesSettings. Over the past half century, we've split the atom, we've spliced the gene and we've roamed Tranquility Base. We've reached for the stars and never have we been closer to having them in our grasp. That has nothing to do with shiny updates. 

Props ericlewis, jorbin, and drewapicture for testing
Fixes #31528


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


git-svn-id: http://core.svn.wordpress.org/trunk@31730 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-03-12 08:53:26 +00:00
Helen Hou-Sandí
296dba2804 Nav menus: Return to calling links "Custom Links". 
It was like this before 3.6 and got a bit lost during that development cycle. Also uses the terminology more consistently in the nav menu UI.

props tyxla.
fixes #31344.

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


git-svn-id: http://core.svn.wordpress.org/trunk@31729 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-03-12 06:15:27 +00:00
Helen Hou-Sandí
593bd1251a Star ratings: Use a yellow color across the board. Keying these to color schemes originally turned out to be weird. 
props hugobaeta.
fixes #31424.

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


git-svn-id: http://core.svn.wordpress.org/trunk@31728 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-03-12 05:41:27 +00:00
Andrew Nacin
364a2450c2 The partial change to the script handle in [31744] was not actually intended. 
see #31242.

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


git-svn-id: http://core.svn.wordpress.org/trunk@31727 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-03-12 03:36:28 +00:00
Gary Pendergast
cd0e4a29fe Add new smiley images missed in [31733]. 
See #31242


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


git-svn-id: http://core.svn.wordpress.org/trunk@31726 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-03-12 03:28:26 +00:00
Andrew Nacin
78679bfb3f Emoji JS cleanup. 
* Filename: emoji.js => wp-emoji.js
 * Script handle: emoji => wp-emoji
 * Object: WPEmoji => wp.emoji
 * Script settings: EmojiSettings => _wpemojiSettings
 * Setting key: base_url => baseUrl
 * Remove executable bit from files

see #31242.

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


git-svn-id: http://core.svn.wordpress.org/trunk@31725 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-03-12 03:17:26 +00:00
Sergey Biryukov
93e6326f8c Press This: Remove obsolete help tab in Settings -> Writing. 
props kraftbj.
fixes #26794.
Built from https://develop.svn.wordpress.org/trunk@31743


git-svn-id: http://core.svn.wordpress.org/trunk@31724 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-03-12 02:37:27 +00:00
Andrew Ozz
04494a6c32 TinyMCE wpViews: always import the non-default editor styles in the sandbox iframe in views. 
Props iseulde, mattheu. Fixes #31464.
Built from https://develop.svn.wordpress.org/trunk@31742


git-svn-id: http://core.svn.wordpress.org/trunk@31723 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2015-03-12 01:05:54 +00:00