<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[32590] trunk/src/wp-includes/formatting.php: Add missing doc blocks to `formatting.php`.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/32590">32590</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/32590","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>wonderboymusic</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-05-25 02:58:00 +0000 (Mon, 25 May 2015)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Add missing doc blocks to `formatting.php`.
Rehabilitate the spacing of various doc blocks.
Standardize some return values that are adjacent to similar functions.
See <a href="https://core.trac.wordpress.org/ticket/32444">#32444</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesformattingphp">trunk/src/wp-includes/formatting.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesformattingphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/formatting.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/formatting.php 2015-05-24 21:27:12 UTC (rev 32589)
+++ trunk/src/wp-includes/formatting.php 2015-05-25 02:58:00 UTC (rev 32590)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -21,13 +21,22 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Code within certain html blocks are skipped.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 0.71
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @uses $wp_cockneyreplace Array of formatted entities for certain common phrases
</del><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global array $wp_cockneyreplace Array of formatted entities for certain common phrases
+ * @global array $shortcode_tags
+ * @staticvar array $static_characters
+ * @staticvar array $static_replacements
+ * @staticvar array $dynamic_characters
+ * @staticvar array $dynamic_replacements
+ * @staticvar array $default_no_texturize_tags
+ * @staticvar array $default_no_texturize_shortcodes
+ * @staticvar bool $run_texturize
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string $text The text to be formatted
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param bool $reset Set to true for unit testing. Translated patterns will reset.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param bool $reset Set to true for unit testing. Translated patterns will reset.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return string The string replaced with html entities
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function wptexturize($text, $reset = false) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function wptexturize( $text, $reset = false ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wp_cockneyreplace, $shortcode_tags;
</span><span class="cx" style="display: block; padding: 0 10px"> static $static_characters, $static_replacements, $dynamic_characters, $dynamic_replacements,
</span><span class="cx" style="display: block; padding: 0 10px"> $default_no_texturize_tags, $default_no_texturize_shortcodes, $run_texturize = true;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -297,9 +306,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $text = implode( '', $textarr );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Replace each & with & unless it already looks like an entity.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $text = preg_replace('/&(?!#(?:\d+|x[a-f0-9]+);|[a-z1-4]{1,8};)/i', '&', $text);
-
- return $text;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return preg_replace( '/&(?!#(?:\d+|x[a-f0-9]+);|[a-z1-4]{1,8};)/i', '&', $text );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -313,10 +320,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @access private
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $text Text to check. Must be a tag like `<html>` or `[shortcode]`.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param array $stack List of open tag elements.
- * @param array $disabled_elements The tag names to match against. Spaces are not allowed in tag names.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param array $stack List of open tag elements.
+ * @param array $disabled_elements The tag names to match against. Spaces are not allowed in tag names.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function _wptexturize_pushpop_element($text, &$stack, $disabled_elements) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function _wptexturize_pushpop_element( $text, &$stack, $disabled_elements ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Is it an opening tag or closing tag?
</span><span class="cx" style="display: block; padding: 0 10px"> if ( '/' !== $text[1] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $opening_tag = true;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -370,7 +377,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * after paragraphing. Default true.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string Text which has been converted into correct paragraph tags.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function wpautop($pee, $br = true) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function wpautop( $pee, $br = true ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $pre_tags = array();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( trim($pee) === '' )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -419,7 +426,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $pee = preg_replace('!(</' . $allblocks . '>)!', "$1\n\n", $pee);
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Standardize newline characters to "\n".
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $pee = str_replace(array("\r\n", "\r"), "\n", $pee);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $pee = str_replace(array("\r\n", "\r"), "\n", $pee);
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Collapse line breaks before and after <option> elements so they don't get autop'd.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( strpos( $pee, '<option' ) !== false ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -462,24 +469,24 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Under certain strange conditions it could create a P of entirely whitespace.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $pee = preg_replace('|<p>\s*</p>|', '', $pee);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $pee = preg_replace('|<p>\s*</p>|', '', $pee);
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Add a closing <p> inside <div>, <address>, or <form> tag if missing.
</span><span class="cx" style="display: block; padding: 0 10px"> $pee = preg_replace('!<p>([^<]+)</(div|address|form)>!', "<p>$1</p></$2>", $pee);
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> // If an opening or closing block element tag is wrapped in a <p>, unwrap it.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $pee = preg_replace('!<p>\s*(</?' . $allblocks . '[^>]*>)\s*</p>!', "$1", $pee);
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $pee = preg_replace('!<p>\s*(</?' . $allblocks . '[^>]*>)\s*</p>!', "$1", $pee);
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // In some cases <li> may get wrapped in <p>, fix them.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $pee = preg_replace("|<p>(<li.+?)</p>|", "$1", $pee);
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $pee = preg_replace("|<p>(<li.+?)</p>|", "$1", $pee);
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // If a <blockquote> is wrapped with a <p>, move it inside the <blockquote>.
</span><span class="cx" style="display: block; padding: 0 10px"> $pee = preg_replace('|<p><blockquote([^>]*)>|i', "<blockquote$1><p>", $pee);
</span><span class="cx" style="display: block; padding: 0 10px"> $pee = str_replace('</blockquote></p>', '</p></blockquote>', $pee);
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> // If an opening or closing block element tag is preceded by an opening <p> tag, remove it.
</span><span class="cx" style="display: block; padding: 0 10px"> $pee = preg_replace('!<p>\s*(</?' . $allblocks . '[^>]*>)!', "$1", $pee);
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> // If an opening or closing block element tag is followed by a closing <p> tag, remove it.
</span><span class="cx" style="display: block; padding: 0 10px"> $pee = preg_replace('!(</?' . $allblocks . '[^>]*>)\s*</p>!', "$1", $pee);
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -489,7 +496,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $pee = preg_replace_callback('/<(script|style).*?<\/\\1>/s', '_autop_newline_preservation_helper', $pee);
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Replace any new line characters that aren't preceded by a <br /> with a <br />.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $pee = preg_replace('|(?<!<br />)\s*\n|', "<br />\n", $pee);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $pee = preg_replace('|(?<!<br />)\s*\n|', "<br />\n", $pee);
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Replace newline placeholders with newlines.
</span><span class="cx" style="display: block; padding: 0 10px"> $pee = str_replace('<WPPreserveNewline />', "\n", $pee);
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -497,7 +504,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // If a <br /> tag is after an opening or closing block tag, remove it.
</span><span class="cx" style="display: block; padding: 0 10px"> $pee = preg_replace('!(</?' . $allblocks . '[^>]*>)\s*<br />!', "$1", $pee);
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> // If a <br /> tag is before a subset of opening or closing block tags, remove it.
</span><span class="cx" style="display: block; padding: 0 10px"> $pee = preg_replace('!<br />(\s*</?(?:p|li|div|dl|dd|dt|th|pre|td|ul|ol)[^>]*>)!', '$1', $pee);
</span><span class="cx" style="display: block; padding: 0 10px"> $pee = preg_replace( "|\n</p>$|", '</p>', $pee );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -519,7 +526,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function _autop_newline_preservation_helper( $matches ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return str_replace("\n", "<WPPreserveNewline />", $matches[0]);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return str_replace( "\n", "<WPPreserveNewline />", $matches[0] );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -529,6 +536,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.9.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global array $shortcode_tags
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string $pee The content.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string The filtered content.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -589,7 +598,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $str The string to be checked
</span><span class="cx" style="display: block; padding: 0 10px"> * @return bool True if $str fits a UTF-8 model, false otherwise.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function seems_utf8($str) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function seems_utf8( $str ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> mbstring_binary_safe_encoding();
</span><span class="cx" style="display: block; padding: 0 10px"> $length = strlen($str);
</span><span class="cx" style="display: block; padding: 0 10px"> reset_mbstring_encoding();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -621,10 +630,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.2.2
</span><span class="cx" style="display: block; padding: 0 10px"> * @access private
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $string The text which is to be encoded.
- * @param int $quote_style Optional. Converts double quotes if set to ENT_COMPAT, both single and double if set to ENT_QUOTES or none if set to ENT_NOQUOTES. Also compatible with old values; converting single quotes if set to 'single', double if set to 'double' or both if otherwise set. Default is ENT_NOQUOTES.
- * @param string $charset Optional. The character encoding of the string. Default is false.
- * @param boolean $double_encode Optional. Whether to encode existing html entities. Default is false.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @staticvar string|false $_charset
+ *
+ * @param string $string The text which is to be encoded.
+ * @param int $quote_style Optional. Converts double quotes if set to ENT_COMPAT, both single and double if set to ENT_QUOTES or none if set to ENT_NOQUOTES. Also compatible with old values; converting single quotes if set to 'single', double if set to 'double' or both if otherwise set. Default is ENT_NOQUOTES.
+ * @param string $charset Optional. The character encoding of the string. Default is false.
+ * @param bool $double_encode Optional. Whether to encode existing html entities. Default is false.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return string The encoded text with HTML entities.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function _wp_specialchars( $string, $quote_style = ENT_NOQUOTES, $charset = false, $double_encode = false ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -701,8 +712,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.8.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $string The text which is to be decoded.
- * @param mixed $quote_style Optional. Converts double quotes if set to ENT_COMPAT, both single and double if set to ENT_QUOTES or none if set to ENT_NOQUOTES. Also compatible with old _wp_specialchars() values; converting single quotes if set to 'single', double if set to 'double' or both if otherwise set. Default is ENT_NOQUOTES.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $string The text which is to be decoded.
+ * @param string|int $quote_style Optional. Converts double quotes if set to ENT_COMPAT,
+ * both single and double if set to ENT_QUOTES or
+ * none if set to ENT_NOQUOTES.
+ * Also compatible with old _wp_specialchars() values;
+ * converting single quotes if set to 'single',
+ * double if set to 'double' or both if otherwise set.
+ * Default is ENT_NOQUOTES.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return string The decoded text without HTML entities.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_specialchars_decode( $string, $quote_style = ENT_NOQUOTES ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -758,8 +775,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.8.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $string The text which is to be checked.
- * @param boolean $strip Optional. Whether to attempt to strip out invalid UTF8. Default is false.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @staticvar bool $is_utf8
+ * @staticvar bool $utf8_pcre
+ *
+ * @param string $string The text which is to be checked.
+ * @param bool $strip Optional. Whether to attempt to strip out invalid UTF8. Default is false.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return string The checked text.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_check_invalid_utf8( $string, $strip = false ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -807,7 +827,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.5.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $utf8_string
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param int $length Max length of the string
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param int $length Max length of the string
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return string String with Unicode encoded for URI.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function utf8_uri_encode( $utf8_string, $length = 0 ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -870,7 +890,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $string Text that might have accent characters
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string Filtered string with replaced "nice" characters.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function remove_accents($string) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function remove_accents( $string ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( !preg_match('/[\x80-\xff]/', $string) )
</span><span class="cx" style="display: block; padding: 0 10px"> return $string;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1187,7 +1207,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.0.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $username The username to be sanitized.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param bool $strict If set limits $username to specific characters. Default false.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param bool $strict If set limits $username to specific characters. Default false.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return string The sanitized username, after passing through filters.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function sanitize_user( $username, $strict = false ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1253,9 +1273,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.0.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $title The string to be sanitized.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $title The string to be sanitized.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string $fallback_title Optional. A title to use if $title is empty.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $context Optional. The operation for which the string is sanitized
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $context Optional. The operation for which the string is sanitized
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return string The sanitized string.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function sanitize_title( $title, $fallback_title = '', $context = 'save' ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1303,9 +1323,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.2.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $title The title to be sanitized.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $title The title to be sanitized.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string $raw_title Optional. Not used.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $context Optional. The operation for which the string is sanitized.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $context Optional. The operation for which the string is sanitized.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return string The sanitized title.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function sanitize_title_with_dashes( $title, $raw_title = '', $context = 'display' ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1372,7 +1392,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.5.1
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $orderby Order by clause to be validated.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return string|bool Returns $orderby if valid, false otherwise.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return string|false Returns $orderby if valid, false otherwise.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function sanitize_sql_orderby( $orderby ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( preg_match( '/^\s*(([a-z0-9_]+|`[a-z0-9_]+`)(\s+(ASC|DESC))?\s*(,\s*(?=[a-z0-9_`])|$))+$/i', $orderby ) || preg_match( '/^\s*RAND\(\s*\)\s*$/i', $orderby ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1391,7 +1411,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.8.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $class The classname to be sanitized
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $class The classname to be sanitized
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string $fallback Optional. The value to return if the sanitization ends up as an empty string.
</span><span class="cx" style="display: block; padding: 0 10px"> * Defaults to an empty string.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string The sanitized value
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1427,11 +1447,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 0.71
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $content String of characters to be converted.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $content String of characters to be converted.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string $deprecated Not used.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string Converted string.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function convert_chars($content, $deprecated = '') {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function convert_chars( $content, $deprecated = '' ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( !empty( $deprecated ) )
</span><span class="cx" style="display: block; padding: 0 10px"> _deprecated_argument( __FUNCTION__, '0.71' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1493,8 +1513,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 0.71
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $text Text to be balanced
- * @param bool $force If true, forces balancing, ignoring the value of the option. Default false.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $text Text to be balanced
+ * @param bool $force If true, forces balancing, ignoring the value of the option. Default false.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return string Balanced text
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function balanceTags( $text, $force = false ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1645,8 +1665,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 0.71
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $content The text about to be edited.
- * @param bool $richedit Whether the $content should not pass through htmlspecialchars(). Default false (meaning it will be passed).
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $content The text about to be edited.
+ * @param bool $richedit Whether the $content should not pass through htmlspecialchars(). Default false (meaning it will be passed).
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return string The text after the filter (and possibly htmlspecialchars()) has been run.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function format_to_edit( $content, $richedit = false ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1676,12 +1696,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 0.71
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param mixed $number Number to append zeros to if not greater than threshold.
- * @param int $threshold Digit places number needs to be to not have zeros added.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param int $number Number to append zeros to if not greater than threshold.
+ * @param int $threshold Digit places number needs to be to not have zeros added.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return string Adds leading zeros to number if needed.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function zeroise($number, $threshold) {
- return sprintf('%0'.$threshold.'s', $number);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function zeroise( $number, $threshold ) {
+ return sprintf( '%0' . $threshold . 's', $number );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1692,7 +1712,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $string Value to which backslashes will be added.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string String with backslashes inserted.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function backslashit($string) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function backslashit( $string ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $string[0] ) && $string[0] >= '0' && $string[0] <= '9' )
</span><span class="cx" style="display: block; padding: 0 10px"> $string = '\\\\' . $string;
</span><span class="cx" style="display: block; padding: 0 10px"> return addcslashes( $string, 'A..Za..z' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1760,7 +1780,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param mixed $value The value to be stripped.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return mixed Stripped value.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function stripslashes_deep($value) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function stripslashes_deep( $value ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( is_array($value) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $value = array_map('stripslashes_deep', $value);
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( is_object($value) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1784,9 +1804,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array|string $value The array or string to be encoded.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array|string $value The encoded array (or string from the callback).
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function urlencode_deep($value) {
- $value = is_array($value) ? array_map('urlencode_deep', $value) : urlencode($value);
- return $value;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function urlencode_deep( $value ) {
+ return is_array( $value ) ? array_map( 'urlencode_deep', $value ) : urlencode( $value );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1807,7 +1826,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 0.71
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $email_address Email address.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param int $hex_encoding Optional. Set to 1 to enable hex encoding.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param int $hex_encoding Optional. Set to 1 to enable hex encoding.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return string Converted email address.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function antispambot( $email_address, $hex_encoding = 0 ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1823,9 +1842,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $email_no_spam_address = str_replace( '@', '@', $email_no_spam_address );
-
- return $email_no_spam_address;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return str_replace( '@', '@', $email_no_spam_address );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1840,7 +1857,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $matches Single Regex Match.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string HTML A element with URI address.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function _make_url_clickable_cb($matches) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function _make_url_clickable_cb( $matches ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $url = $matches[2];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ')' == $matches[3] && strpos( $url, '(' ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1877,7 +1894,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $matches Single Regex Match.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string HTML A element with URL address.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function _make_web_ftp_clickable_cb($matches) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function _make_web_ftp_clickable_cb( $matches ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $ret = '';
</span><span class="cx" style="display: block; padding: 0 10px"> $dest = $matches[2];
</span><span class="cx" style="display: block; padding: 0 10px"> $dest = 'http://' . $dest;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1905,7 +1922,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $matches Single Regex Match.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string HTML A element with email address.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function _make_email_clickable_cb($matches) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function _make_email_clickable_cb( $matches ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $email = $matches[2] . '@' . $matches[3];
</span><span class="cx" style="display: block; padding: 0 10px"> return $matches[1] . "<a href=\"mailto:$email\">$email</a>";
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1976,8 +1993,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Cleanup of accidental links within links
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $r = preg_replace( '#(<a([ \r\n\t]+[^>]+?>|>))<a [^>]+?>([^>]+?)</a></a>#i', "$1$3</a>", $r );
- return $r;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return preg_replace( '#(<a([ \r\n\t]+[^>]+?>|>))<a [^>]+?>([^>]+?)</a></a>#i', "$1$3</a>", $r );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2006,7 +2022,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @access private
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $string The string to split.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param int $goal The desired chunk length.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param int $goal The desired chunk length.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return array Numeric array of chunks.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function _split_str_by_whitespace( $string, $goal ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2048,8 +2064,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // This is a pre save filter, so text is already escaped.
</span><span class="cx" style="display: block; padding: 0 10px"> $text = stripslashes($text);
</span><span class="cx" style="display: block; padding: 0 10px"> $text = preg_replace_callback('|<a (.+?)>|i', 'wp_rel_nofollow_callback', $text);
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $text = wp_slash($text);
- return $text;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return wp_slash( $text );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2076,9 +2091,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Looks up one smiley code in the $wpsmiliestrans global array and returns an
</span><span class="cx" style="display: block; padding: 0 10px"> * `<img>` string for that smiley.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @global array $wpsmiliestrans
</del><span class="cx" style="display: block; padding: 0 10px"> * @since 2.8.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global array $wpsmiliestrans
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param array $matches Single match. Smiley code to convert to image.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string Image string for smiley.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2121,8 +2137,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * used in the function isn't empty.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 0.71
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @uses $wp_smiliessearch
</del><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global string|array $wp_smiliessearch
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string $text Content to convert smilies from text.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string Converted content with text smilies replaced with images.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2172,8 +2189,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 0.71
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $email Email address to verify.
- * @param boolean $deprecated Deprecated.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $email Email address to verify.
+ * @param bool $deprecated Deprecated.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return string|bool Either false or the valid email address.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function is_email( $email, $deprecated = false ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2265,14 +2282,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $string Subject line
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string Converted string to ASCII
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function wp_iso_descrambler($string) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function wp_iso_descrambler( $string ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> /* this may only work with iso-8859-1, I'm afraid */
</span><span class="cx" style="display: block; padding: 0 10px"> if (!preg_match('#\=\?(.+)\?Q\?(.+)\?\=#i', $string, $matches)) {
</span><span class="cx" style="display: block; padding: 0 10px"> return $string;
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $subject = str_replace('_', ' ', $matches[2]);
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $subject = preg_replace_callback('#\=([0-9a-f]{2})#i', '_wp_iso_convert', $subject);
- return $subject;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return preg_replace_callback( '#\=([0-9a-f]{2})#i', '_wp_iso_convert', $subject );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2359,7 +2375,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $timezone Either 'Z' for 0 offset or '±hhmm'.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return int|float The offset in seconds.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function iso8601_timezone_to_offset($timezone) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function iso8601_timezone_to_offset( $timezone ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // $timezone is either 'Z' or '[+|-]hhmm'
</span><span class="cx" style="display: block; padding: 0 10px"> if ($timezone == 'Z') {
</span><span class="cx" style="display: block; padding: 0 10px"> $offset = 0;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2378,10 +2394,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.5.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $date_string Date and time in ISO 8601 format {@link http://en.wikipedia.org/wiki/ISO_8601}.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $timezone Optional. If set to GMT returns the time minus gmt_offset. Default is 'user'.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $timezone Optional. If set to GMT returns the time minus gmt_offset. Default is 'user'.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return string The date and time in MySQL DateTime format - Y-m-d H:i:s.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function iso8601_to_datetime($date_string, $timezone = 'user') {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function iso8601_to_datetime( $date_string, $timezone = 'user' ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $timezone = strtolower($timezone);
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ($timezone == 'gmt') {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2416,7 +2432,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $text Content to replace links to open in a new window.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string Content that has filtered links.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function popuplinks($text) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function popuplinks( $text ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $text = preg_replace('/<a (.+?)>/i', "<a $1 target='_blank' rel='external'>", $text);
</span><span class="cx" style="display: block; padding: 0 10px"> return $text;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2532,7 +2548,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.5.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $from Unix timestamp from which the difference begins.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param int $to Optional. Unix timestamp to end the time difference. Default becomes time() if not set.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param int $to Optional. Unix timestamp to end the time difference. Default becomes time() if not set.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return string Human readable time difference.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function human_time_diff( $from, $to = '' ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2603,7 +2619,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $text Optional. The excerpt. If set to empty, an excerpt is generated.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string The excerpt.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function wp_trim_excerpt($text = '') {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function wp_trim_excerpt( $text = '' ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $raw_excerpt = $text;
</span><span class="cx" style="display: block; padding: 0 10px"> if ( '' == $text ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $text = get_the_content('');
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2652,9 +2668,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.3.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $text Text to trim.
- * @param int $num_words Number of words. Default 55.
- * @param string $more Optional. What to append if $text needs to be trimmed. Default '…'.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $text Text to trim.
+ * @param int $num_words Number of words. Default 55.
+ * @param string $more Optional. What to append if $text needs to be trimmed. Default '…'.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return string Trimmed text.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_trim_words( $text, $num_words = 55, $more = null ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2701,7 +2717,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $text The text within which entities will be converted.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string Text with converted entities.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function ent2ncr($text) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function ent2ncr( $text ) {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filter text before named entities are converted into numbered entities.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2990,7 +3006,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $text The text to be formatted.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string The formatted text after filter is applied.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function wp_richedit_pre($text) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function wp_richedit_pre( $text ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $text ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filter text returned for the rich text editor.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3028,7 +3044,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $output The text to be formatted.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string Formatted text after filter applied.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function wp_htmledit_pre($output) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function wp_htmledit_pre( $output ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( !empty($output) )
</span><span class="cx" style="display: block; padding: 0 10px"> $output = htmlspecialchars($output, ENT_NOQUOTES, get_option( 'blog_charset' ) ); // convert only < > &
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3052,8 +3068,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.8.1
</span><span class="cx" style="display: block; padding: 0 10px"> * @access private
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string|array $search The value being searched for, otherwise known as the needle. An array may be used to designate multiple needles.
- * @param string $subject The string being searched and replaced on, otherwise known as the haystack.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string|array $search The value being searched for, otherwise known as the needle.
+ * An array may be used to designate multiple needles.
+ * @param string $subject The string being searched and replaced on, otherwise known as the haystack.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return string The string with the replaced svalues.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function _deep_replace( $search, $subject ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3075,6 +3092,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * is preparing an array for use in an IN clause.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.8.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
+ * @global wpdb $wpdb
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string|array $data Unescaped data
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string|array Escaped data
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3092,10 +3112,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.8.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $url The URL to be cleaned.
- * @param array $protocols Optional. An array of acceptable protocols.
- * Defaults to 'http', 'https', 'ftp', 'ftps', 'mailto', 'news', 'irc', 'gopher', 'nntp', 'feed', 'telnet', 'mms', 'rtsp', 'svn' if not set.
- * @param string $_context Private. Use esc_url_raw() for database usage.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $url The URL to be cleaned.
+ * @param array $protocols Optional. An array of acceptable protocols.
+ * Defaults to 'http', 'https', 'ftp', 'ftps', 'mailto',
+ * 'news', 'irc', 'gopher', 'nntp', 'feed', 'telnet', 'mms',
+ * 'rtsp', 'svn' if not set.
+ * @param string $_context Private. Use esc_url_raw() for database usage.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return string The cleaned $url after the 'clean_url' filter is applied.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function esc_url( $url, $protocols = null, $_context = 'display' ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3149,8 +3171,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.8.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $url The URL to be cleaned.
- * @param array $protocols An array of acceptable protocols.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $url The URL to be cleaned.
+ * @param array $protocols An array of acceptable protocols.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return string The cleaned URL.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function esc_url_raw( $url, $protocols = null ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3167,7 +3189,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $myHTML The text to be converted.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string Converted text.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function htmlentities2($myHTML) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function htmlentities2( $myHTML ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $translation_table = get_html_translation_table( HTML_ENTITIES, ENT_QUOTES );
</span><span class="cx" style="display: block; padding: 0 10px"> $translation_table[chr(38)] = '&';
</span><span class="cx" style="display: block; padding: 0 10px"> return preg_replace( "/&(?![A-Za-z]{0,4}\w{2,3};|#[0-9]{2,3};)/", "&", strtr($myHTML, $translation_table) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3284,7 +3306,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $tag_name
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function tag_escape($tag_name) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function tag_escape( $tag_name ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $safe_tag = strtolower( preg_replace('/[^a-zA-Z0-9_:]/', '', $tag_name) );
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filter a string cleaned and escaped for output as an HTML tag.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3321,11 +3343,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.0.5
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global wpdb $wpdb
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string $option The name of the option.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $value The unsanitised value.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $value The unsanitised value.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return string Sanitized value.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function sanitize_option($option, $value) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function sanitize_option( $option, $value ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $original_value = $value;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3523,9 +3547,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $option The option name.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $original_value The original value passed to the function.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $value = apply_filters( "sanitize_option_{$option}", $value, $option, $original_value );
-
- return $value;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return apply_filters( "sanitize_option_{$option}", $value, $option, $original_value );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3537,7 +3559,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.2.1
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $string The string to be parsed.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param array $array Variables will be stored in this array.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param array $array Variables will be stored in this array.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_parse_str( $string, &$array ) {
</span><span class="cx" style="display: block; padding: 0 10px"> parse_str( $string, $array );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3587,7 +3609,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.5.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @link http://www.php.net/sprintf
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $pattern The string which formatted args are inserted.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $pattern The string which formatted args are inserted.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param mixed $args ,... Arguments to be formatted into the $pattern string.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string The formatted string.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3662,10 +3684,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.5.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $pattern Content containing '%l' at the beginning.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param array $args List items to prepend to the content and replace '%l'.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param array $args List items to prepend to the content and replace '%l'.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return string Localized list items and rest of the content.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function wp_sprintf_l($pattern, $args) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function wp_sprintf_l( $pattern, $args ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Not a match
</span><span class="cx" style="display: block; padding: 0 10px"> if ( substr($pattern, 0, 2) != '%l' )
</span><span class="cx" style="display: block; padding: 0 10px"> return $pattern;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3720,9 +3742,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.5.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $str String to get the excerpt from.
- * @param integer $count Maximum number of characters to take.
- * @param string $more Optional. What to append if $str needs to be trimmed. Defaults to empty string.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $str String to get the excerpt from.
+ * @param int $count Maximum number of characters to take.
+ * @param string $more Optional. What to append if $str needs to be trimmed. Defaults to empty string.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return string The excerpt.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_html_excerpt( $str, $count, $more = null ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3745,9 +3767,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.7.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global string $_links_add_base
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string $content String to search for links in.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $base The base URL to prefix to links.
- * @param array $attrs The attributes which should be processed.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $base The base URL to prefix to links.
+ * @param array $attrs The attributes which should be processed.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return string The processed content.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function links_add_base_url( $content, $base, $attrs = array('src', 'href') ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3763,10 +3787,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.7.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @access private
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global string $_links_add_base
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string $m The matched link.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string The processed link.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function _links_add_base($m) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function _links_add_base( $m ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $_links_add_base;
</span><span class="cx" style="display: block; padding: 0 10px"> //1 = attribute name 2 = quotation mark 3 = URL
</span><span class="cx" style="display: block; padding: 0 10px"> return $m[1] . '=' . $m[2] .
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3787,9 +3813,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.7.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global string $_links_add_target
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string $content String to search for links in.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $target The Target to add to the links.
- * @param array $tags An array of tags to apply to.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $target The Target to add to the links.
+ * @param array $tags An array of tags to apply to.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return string The processed content.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function links_add_target( $content, $target = '_blank', $tags = array('a') ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3805,6 +3833,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.7.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @access private
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global string $_links_add_target
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string $m The matched link.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string The processed link.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3839,8 +3869,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.9.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $string String containing HTML tags
- * @param bool $remove_breaks optional Whether to remove left over line breaks and white space chars
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $string String containing HTML tags
+ * @param bool $remove_breaks Optional. Whether to remove left over line breaks and white space chars
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return string The processed string.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_strip_all_tags($string, $remove_breaks = false) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3867,7 +3897,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $str
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function sanitize_text_field($str) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function sanitize_text_field( $str ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $filtered = wp_check_invalid_utf8( $str );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( strpos($filtered, '<') !== false ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3905,7 +3935,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.1.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $path A path.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $path A path.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string $suffix If the filename ends in suffix this will also be cut off.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3919,6 +3949,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Violating our coding standards for a good function name.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.0.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
+ * @staticvar string|false $dblq
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function capital_P_dangit( $text ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Simple replacement for titles
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4035,7 +4067,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.6.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $content A string which might contain a URL.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return string The found URL.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return string|false The found URL.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function get_url_in_content( $content ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $content ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4058,6 +4090,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.0.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @staticvar string $spaces
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return string The spaces regexp.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_spaces_regexp() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4086,6 +4120,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Print the important emoji-related styles.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.2.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
+ * @staticvar bool $printed
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function print_emoji_styles() {
</span><span class="cx" style="display: block; padding: 0 10px"> static $printed = false;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4113,6 +4149,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/**
+ *
+ * @global string $wp_version
+ * @staticvar bool $printed
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> function print_emoji_detection_script() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wp_version;
</span><span class="cx" style="display: block; padding: 0 10px"> static $printed = false;
</span></span></pre>
</div>
</div>
</body>
</html>