Commit Graph

501 Commits

Author SHA1 Message Date
Andrew Ozz 373ba799c3 Backport r33469 and r33470 to 4.2.
See #33106.
Built from https://develop.svn.wordpress.org/branches/4.2@33518


git-svn-id: http://core.svn.wordpress.org/branches/4.2@33485 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-07-30 19:41:27 +00:00
Gary Pendergast 4cd2612edc Shortcodes: Improve the reliablity of shortcodes inside HTML tags.
Merge of [33359] to the 4.2 branch.

Props miqrogroove.

See #15694.


Built from https://develop.svn.wordpress.org/branches/4.2@33360


git-svn-id: http://core.svn.wordpress.org/branches/4.2@33332 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-07-22 05:44:27 +00:00
Gary Pendergast 85e880b5b2 `sanitize_option()` needs to handle `WP_Error`. DRY the conditional calls to `add_settings_error()`.
Merge of [32791] to the 4.2 branch.

Props wonderboymusic, chriscct7 for an initial patch.

Fixes #32350.


Built from https://develop.svn.wordpress.org/branches/4.2@33326


git-svn-id: http://core.svn.wordpress.org/branches/4.2@33298 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-07-19 23:26:27 +00:00
Andrew Ozz 9a74f7c01a Check if running from /src or SCRIPT_DEBUG is defined in print_emoji_detection_script().
Fixes #32118 for 4.2.
Built from https://develop.svn.wordpress.org/branches/4.2@33315


git-svn-id: http://core.svn.wordpress.org/branches/4.2@33287 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-07-17 21:40:27 +00:00
Andrew Ozz 897691addd Emoji:
- Fix loading errors in IE9 and IE10.
- Add fallbacks for the loading events.
Fixes #32109 for 4.2.
Built from https://develop.svn.wordpress.org/branches/4.2@32361


git-svn-id: http://core.svn.wordpress.org/branches/4.2@32332 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-05-06 01:35:26 +00:00
Gary Pendergast f32bbeeb95 Clean up some edge cases in `sanitize_sql_orderby()`.
Props vortfu, dd32.


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


git-svn-id: http://core.svn.wordpress.org/trunk@32139 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-04-20 05:42:25 +00:00
Andrew Nacin 7f1b31f80f Clean up wp_staticize_emoji() and friends.
* DOMDocument was removed in [31752] but not the check.
 * wp_staticize_emoji() has never accepted a second arg; remove it from calls.
 * Remove wp_staticize_emoji_for_feeds(), no need for it.
 * Remove _ and @ignore from wp_staticize_emoji_for_email(), no need for it.

see #31242.

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


git-svn-id: http://core.svn.wordpress.org/trunk@32136 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-04-20 04:15:26 +00:00
Gary Pendergast 5a547231b7 Emoji: The emoji JS files should be run through the `script_loader_src` filter, as they would be if they were registered scripts.
Props peterwilsoncc.

Fixes #31938.


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


git-svn-id: http://core.svn.wordpress.org/trunk@32076 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-04-09 11:07:28 +00:00
Gary Pendergast dcf2710bc9 Emoji: Tidy up the `wp_encode_emoji()` regex, and clarify the function comment on Unicode 8 support.
Built from https://develop.svn.wordpress.org/trunk@32096


git-svn-id: http://core.svn.wordpress.org/trunk@32075 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-04-09 04:37:30 +00:00
Drew Jaynes 82e4990b73 Various docs syntax fixes in wp-includes/formatting.php.
See #31888.

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


git-svn-id: http://core.svn.wordpress.org/trunk@32018 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-04-05 15:51:27 +00:00
Gary Pendergast 2b7efe5c86 Emoji: [31938] forgot a `/` in the emoji CDN URL.
See #31651.


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


git-svn-id: http://core.svn.wordpress.org/trunk@31956 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-04-02 00:11:27 +00:00
Scott Taylor 8ec192ce1f Alter the regex in `wptexturize()` to properly handle input like: `<> "Hello world" <>`.
Updates unit test data.

Props miqrogroove.
Fixes #30344.

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


git-svn-id: http://core.svn.wordpress.org/trunk@31944 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-04-01 19:09:28 +00:00
Gary Pendergast 486e80bdf5 Emoji: Change the emoji CDN to w.org, from wp.com.
See #31651.


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


git-svn-id: http://core.svn.wordpress.org/trunk@31917 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-03-31 04:31:29 +00:00
Gary Pendergast 3ddbef69e3 Emoji: When encoding emoji into HTML entities, 0 was being incorrectly trimmed from the right side of the hex string, causing some characters to be encoded incorrectly.
Built from https://develop.svn.wordpress.org/trunk@31926


git-svn-id: http://core.svn.wordpress.org/trunk@31905 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-03-30 03:27:31 +00:00
Gary Pendergast 31db5d08fe Emoji: When staticizing emoji into `<img>` tags, include an `alt` attribute of the original Emoji, to match both Smiley and Twemoji `<img>` tags.
Built from https://develop.svn.wordpress.org/trunk@31924


git-svn-id: http://core.svn.wordpress.org/trunk@31903 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-03-30 03:09:26 +00:00
Gary Pendergast bfb9990548 Emoji: [31864] changed emoji image's inline style from `height` to `max-height`. Unfortunately, anything using `feedparser.py` (for example, NewsBlur) strips out `max-height`, which gives us massive emoji in feeds.
This re-adds `height`, and also reminds us why we can't have nice things.

See #31719.


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


git-svn-id: http://core.svn.wordpress.org/trunk@31888 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-03-27 02:12:28 +00:00
Gary Pendergast 1c6b1b3414 Emoji: Add a comment to `print_emoji_detection_script()` explaining how the `include` statement works as part of the `grunt build` process.
See #31701.


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


git-svn-id: http://core.svn.wordpress.org/trunk@31860 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-03-25 04:09:26 +00:00
Gary Pendergast b53b12ff8c Emoji: Instead of loading the emoji JS files automatically, we now include a small JS shim in the header, to test if the user's browser needs Twemoji. It then loads the emoji JS files only if they're needed.
Props pento, azaozz.

Fixes #31701.


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


git-svn-id: http://core.svn.wordpress.org/trunk@31854 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-03-24 23:33:32 +00:00
Gary Pendergast 3b863ae173 Emoji: Gmail doesn't obey an `<img>`'s inline CSS `height` rule, transforming it to `min-height`. To avoid giant smiley faces everywhere, we're changing the `height` rule to `max-height`, which Gmail plays nicer with.
Props janhenckens.

Fixes #31719.


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


git-svn-id: http://core.svn.wordpress.org/trunk@31843 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-03-23 12:08:26 +00:00
Gary Pendergast 69de85fd48 Emoji: Set the emoji image protocol with `set_url_scheme()`, instead of defaulting to HTTPS.
Props extendwings.

Fixes #31735.


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


git-svn-id: http://core.svn.wordpress.org/trunk@31840 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-03-23 02:11:28 +00:00
Gary Pendergast 73b92df912 Emoji: When we're replacing emoji with `<img>`s in email, we can only do that if the Content-Type is text/html - otherwise, they'll show up in the email as the HTML string.
Fixes #31720 


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


git-svn-id: http://core.svn.wordpress.org/trunk@31839 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-03-22 23:16:28 +00:00
Drew Jaynes bb3ca077ce Add more verbose inline documentation inside of `wpautop()` to more clearly explain what's going on.
Props ericlewis, johneckman, azaozz.
Fixes #31041.

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


git-svn-id: http://core.svn.wordpress.org/trunk@31831 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-03-20 19:47:27 +00:00
Gary Pendergast fd2e5d66e7 When converting emoji in email to static images, check that the message is defined, otherwise we could cause PHP warnings.
Props nerrad.

Fixes #31708.



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


git-svn-id: http://core.svn.wordpress.org/trunk@31827 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-03-20 12:32:26 +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
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
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
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
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
Gary Pendergast 03ade8c011 Add emoji URL support, and Twemoji fallback for displaying slugs in wp-admin, when the browser doesn't natively support emoji.
Props pento, SergeyBiryukov and boonebgorges.

Fixes #31328


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


git-svn-id: http://core.svn.wordpress.org/trunk@31715 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-03-11 22:55:28 +00:00
Gary Pendergast 46e2a65cf1 Add emoji support, with Twemoji fallback.
Replace exisiting smilies with equivalent emoji, or with shiny new smiley images where no emoji existed.

Props batmoo, joen and mkaz for the original plugin upon which this is based.

Props pento, iseulde, kraftbj and peterwilsoncc for making the internet's dreams come true.

See #31242


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


git-svn-id: http://core.svn.wordpress.org/trunk@31714 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-03-11 22:49:28 +00:00
Scott Taylor b4869ed42f Avoid function calls on each iteration of a `for` loop.
See #30799.

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


git-svn-id: http://core.svn.wordpress.org/trunk@31659 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-03-08 23:01:26 +00:00
Scott Taylor 7cb45f2402 Don't call the size function `count()` as part of a test condition in loops. Compute the size beforehand, and not on each iteration.
Scrutinizer added a Performance label: these are the only violations.

See #30799.

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


git-svn-id: http://core.svn.wordpress.org/trunk@31535 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-02-26 05:48:24 +00:00
Gary Pendergast 109d87363d Texturize: Add "em" as a cockney term, so that "'em" is texturized with an apostrophe, instead of an open quote.
Fixes #29813.

Props miqrogroove.


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


git-svn-id: http://core.svn.wordpress.org/trunk@31230 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-01-20 18:44:26 +00:00
Gary Pendergast d0c327443c When a hyphen `-` or double hyphen `--` was at the start or the end of a string, it wasn't texturized correctly.
Fixes #31030


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


git-svn-id: http://core.svn.wordpress.org/trunk@31180 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-01-16 03:54:24 +00:00
Scott Taylor 6b84df3bbd Ensure that `<figcaption>` is not autop'd.
Fixes #29219.

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


git-svn-id: http://core.svn.wordpress.org/trunk@31167 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-01-16 00:27:21 +00:00
Scott Taylor 5547115dc2 Fix some `@param` docs that have chars too close them.
Add `@property` annotations to `WP_User` and `WP_Post`.
Remove erroneous `@param`s from image editor class methods.
Officially add the property `$_column_headers` to `WP_List_Table`.	

See #30799.

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


git-svn-id: http://core.svn.wordpress.org/trunk@31108 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-01-10 06:57:22 +00:00
Scott Taylor 60b0cd7943 The keyword `elseif` should be used instead of `else if` so that all control keywords look like single words.
This was a mess, is now standardized across the codebase, except for a few 3rd-party libs. 

See #30799.

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


git-svn-id: http://core.svn.wordpress.org/trunk@31071 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-01-08 07:05:25 +00:00
Scott Taylor ac4e67b82e Perl-style comments should not be used
See #30799.

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


git-svn-id: http://core.svn.wordpress.org/trunk@31060 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-01-08 05:52:24 +00:00
Gary Pendergast c20f6afb05 Options: When updating options, make sure the user isn't trying to insert characters that aren't supported by the database character set.
See #30361.

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


git-svn-id: http://core.svn.wordpress.org/trunk@31045 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-01-07 04:15: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
Dion Hulse e0ac8c0386 In the `links_add_base()` callback, use a HTTP-aware URL joining function, rather than a filesystem joining function to avoid PHP warnings on certain systems.
Fixes #29950

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


git-svn-id: http://core.svn.wordpress.org/trunk@30756 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-12-07 03:19:23 +00:00
Mark Jaquith 14b0899e57 Revert [28719] and no longer math-process multiplication of negative numbers
see #19308
fixes #30445
props rmccue
Built from https://develop.svn.wordpress.org/trunk@30752


git-svn-id: http://core.svn.wordpress.org/trunk@30742 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-12-06 21:24:23 +00:00
Scott Taylor e619abda6e Improve various `@param` docs for `src/wp-includes/*`.
See #30224.

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


git-svn-id: http://core.svn.wordpress.org/trunk@30671 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-12-01 01:34:24 +00:00
Dion Hulse aba2a6bcfd Fix the PHPDoc example for _split_str_by_whitespace().
Props voldemortensen. Fixes #30504

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


git-svn-id: http://core.svn.wordpress.org/trunk@30565 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-11-26 03:52:22 +00:00
Drew Jaynes 39da8dd15e 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 in wp-includes/formatting.php:
* Markdown-indent code snippets in the description for `wptexturize()`
* Backtick-escape inline code in a parameter description for `_wptexturize_pushpop_element()`
* Backtick-escape inline code in the description for `shortcode_unautop()`
* Backtick-escape HTML tags in the description for `convert_chars()`
* Markdown-indent a code snippet in the description for `_split_str_by_whitespace()`
* Backtick-escape an `<img>` tag in the description for `translate_smiley()`
* Add markdown formatting to the description for `links_add_target()`
* Backtick-escape HTML tags in the description for `wp_strip_all_tags()`

Props rarst.
See #30473.

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


git-svn-id: http://core.svn.wordpress.org/trunk@30529 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-11-24 05:30:25 +00:00
Drew Jaynes 2fda44cb77 Add an entry to the changelog for `wp_make_link_relative()` noting that intentional support was added for relative URLs.
See #30373.

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


git-svn-id: http://core.svn.wordpress.org/trunk@30485 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-11-21 03:44:23 +00:00
Andrew Nacin 6e2f41a2a3 Anchor texturize to shortcodes to improve regex efficiency.
props miqrogroove.
see #29557 for segfault issues.

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


git-svn-id: http://core.svn.wordpress.org/trunk@30443 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-11-20 14:28:23 +00:00
Boone Gorges d95b5196cc Improvements to `wp_make_link_relative()`.
* Support relative URL input.
* When the URL being made relative has another URL as a parameter, don't make the second URL relative.

Props voldemortensen.
Fixes #30373.
Built from https://develop.svn.wordpress.org/trunk@30383


git-svn-id: http://core.svn.wordpress.org/trunk@30380 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-11-19 01:53:24 +00:00