.
$pee = preg_replace('|]*)>|i', "", $pee);
$pee = str_replace('
', '
', $pee);
+
+ // If an opening or closing block element tag is preceded by an opening tag, remove it.
$pee = preg_replace('!
\s*(?' . $allblocks . '[^>]*>)!', "$1", $pee);
+
+ // If an opening or closing block element tag is followed by a closing
tag, remove it.
$pee = preg_replace('!(?' . $allblocks . '[^>]*>)\s*
!', "$1", $pee);
+ // Optionally insert line breaks.
if ( $br ) {
+ // Replace newlines that shouldn't be touched with a placeholder.
$pee = preg_replace_callback('/<(script|style).*?<\/\\1>/s', '_autop_newline_preservation_helper', $pee);
- $pee = preg_replace('|(?)\s*\n|', "
\n", $pee); // optionally make line breaks
+
+ // Replace any new line characters that aren't preceded by a
with a
.
+ $pee = preg_replace('|(?)\s*\n|', "
\n", $pee);
+
+ // Replace newline placeholders with newlines.
$pee = str_replace('', "\n", $pee);
}
+ // If a
tag is after an opening or closing block tag, remove it.
$pee = preg_replace('!(?' . $allblocks . '[^>]*>)\s*
!', "$1", $pee);
+
+ // If a
tag is before a subset of opening or closing block tags, remove it.
$pee = preg_replace('!
(\s*?(?:p|li|div|dl|dd|dt|th|pre|td|ul|ol)[^>]*>)!', '$1', $pee);
$pee = preg_replace( "|\n$|", '', $pee );
+ // Replace placeholder tags with their original content.
if ( !empty($pre_tags) )
$pee = str_replace(array_keys($pre_tags), array_values($pre_tags), $pee);
+ // Restore newlines in all elements.
+ $pee = str_replace( " ", "\n", $pee );
+
return $pee;
}
+/**
+ * Separate HTML elements and comments from the text.
+ *
+ * @since 4.2.4
+ *
+ * @param string $input The text which has to be formatted.
+ * @return array The formatted text.
+ */
+function wp_html_split( $input ) {
+ static $regex;
+
+ if ( ! isset( $regex ) ) {
+ $comments =
+ '!' // Start of comment, after the <.
+ . '(?:' // Unroll the loop: Consume everything until --> is found.
+ . '-(?!->)' // Dash not followed by end of comment.
+ . '[^\-]*+' // Consume non-dashes.
+ . ')*+' // Loop possessively.
+ . '(?:-->)?'; // End of comment. If not found, match all input.
+
+ $cdata =
+ '!\[CDATA\[' // Start of comment, after the <.
+ . '[^\]]*+' // Consume non-].
+ . '(?:' // Unroll the loop: Consume everything until ]]> is found.
+ . '](?!]>)' // One ] not followed by end of comment.
+ . '[^\]]*+' // Consume non-].
+ . ')*+' // Loop possessively.
+ . '(?:]]>)?'; // End of comment. If not found, match all input.
+
+ $regex =
+ '/(' // Capture the entire match.
+ . '<' // Find start of element.
+ . '(?(?=!--)' // Is this a comment?
+ . $comments // Find end of comment.
+ . '|'
+ . '(?(?=!\[CDATA\[)' // Is this a comment?
+ . $cdata // Find end of comment.
+ . '|'
+ . '[^>]*>?' // Find end of element. If not found, match all input.
+ . ')'
+ . ')'
+ . ')/s';
+ }
+
+ return preg_split( $regex, $input, -1, PREG_SPLIT_DELIM_CAPTURE );
+}
+
+/**
+ * Replace characters or phrases within HTML elements only.
+ *
+ * @since 4.2.3
+ *
+ * @param string $haystack The text which has to be formatted.
+ * @param array $replace_pairs In the form array('from' => 'to', ...).
+ * @return string The formatted text.
+ */
+function wp_replace_in_html_tags( $haystack, $replace_pairs ) {
+ // Find all elements.
+ $textarr = wp_html_split( $haystack );
+ $changed = false;
+
+ // Optimize when searching for one item.
+ if ( 1 === count( $replace_pairs ) ) {
+ // Extract $needle and $replace.
+ foreach ( $replace_pairs as $needle => $replace );
+
+ // Loop through delimeters (elements) only.
+ for ( $i = 1, $c = count( $textarr ); $i < $c; $i += 2 ) {
+ if ( false !== strpos( $textarr[$i], $needle ) ) {
+ $textarr[$i] = str_replace( $needle, $replace, $textarr[$i] );
+ $changed = true;
+ }
+ }
+ } else {
+ // Extract all $needles.
+ $needles = array_keys( $replace_pairs );
+
+ // Loop through delimeters (elements) only.
+ for ( $i = 1, $c = count( $textarr ); $i < $c; $i += 2 ) {
+ foreach ( $needles as $needle ) {
+ if ( false !== strpos( $textarr[$i], $needle ) ) {
+ $textarr[$i] = strtr( $textarr[$i], $replace_pairs );
+ $changed = true;
+ // After one strtr() break out of the foreach loop and look at next element.
+ break;
+ }
+ }
+ }
+ }
+
+ if ( $changed ) {
+ $haystack = implode( $textarr );
+ }
+
+ return $haystack;
+}
+
/**
* Newline preservation help function for wpautop
*
@@ -462,7 +628,7 @@ function _autop_newline_preservation_helper( $matches ) {
/**
* Don't auto-p wrap shortcodes that stand alone
*
- * Ensures that shortcodes are not wrapped in <>...<
>.
+ * Ensures that shortcodes are not wrapped in `...
`.
*
* @since 2.9.0
*
@@ -532,14 +698,14 @@ function seems_utf8($str) {
reset_mbstring_encoding();
for ($i=0; $i < $length; $i++) {
$c = ord($str[$i]);
- if ($c < 0x80) $n = 0; # 0bbbbbbb
- elseif (($c & 0xE0) == 0xC0) $n=1; # 110bbbbb
- elseif (($c & 0xF0) == 0xE0) $n=2; # 1110bbbb
- elseif (($c & 0xF8) == 0xF0) $n=3; # 11110bbb
- elseif (($c & 0xFC) == 0xF8) $n=4; # 111110bb
- elseif (($c & 0xFE) == 0xFC) $n=5; # 1111110b
- else return false; # Does not match any model
- for ($j=0; $j<$n; $j++) { # n bytes matching 10bbbbbb follow ?
+ if ($c < 0x80) $n = 0; // 0bbbbbbb
+ elseif (($c & 0xE0) == 0xC0) $n=1; // 110bbbbb
+ elseif (($c & 0xF0) == 0xE0) $n=2; // 1110bbbb
+ elseif (($c & 0xF8) == 0xF0) $n=3; // 11110bbb
+ elseif (($c & 0xFC) == 0xF8) $n=4; // 111110bb
+ elseif (($c & 0xFE) == 0xFC) $n=5; // 1111110b
+ else return false; // Does not match any model
+ for ($j=0; $j<$n; $j++) { // n bytes matching 10bbbbbb follow ?
if ((++$i == $length) || ((ord($str[$i]) & 0xC0) != 0x80))
return false;
}
@@ -559,7 +725,7 @@ function seems_utf8($str) {
* @access private
*
* @param string $string The text which is to be encoded.
- * @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 values; converting single quotes if set to 'single', double if set to 'double' or both if otherwise set. Default is ENT_NOQUOTES.
+ * @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.
* @return string The encoded text with HTML entities.
@@ -615,9 +781,9 @@ function _wp_specialchars( $string, $quote_style = ENT_NOQUOTES, $charset = fals
// Now re-encode everything except &entity;
$string = preg_split( '/(?x?[0-9a-z]+;)/i', $string, -1, PREG_SPLIT_DELIM_CAPTURE );
- for ( $i = 0; $i < count( $string ); $i += 2 )
+ for ( $i = 0, $c = count( $string ); $i < $c; $i += 2 ) {
$string[$i] = @htmlspecialchars( $string[$i], $quote_style, $charset );
-
+ }
$string = implode( '', $string );
}
@@ -767,21 +933,27 @@ function utf8_uri_encode( $utf8_string, $length = 0 ) {
$unicode .= chr($value);
$unicode_length++;
} else {
- if ( count( $values ) == 0 ) $num_octets = ( $value < 224 ) ? 2 : 3;
+ if ( count( $values ) == 0 ) {
+ if ( $value < 224 ) {
+ $num_octets = 2;
+ } elseif ( $value < 240 ) {
+ $num_octets = 3;
+ } else {
+ $num_octets = 4;
+ }
+ }
$values[] = $value;
if ( $length && ( $unicode_length + ($num_octets * 3) ) > $length )
break;
if ( count( $values ) == $num_octets ) {
- if ($num_octets == 3) {
- $unicode .= '%' . dechex($values[0]) . '%' . dechex($values[1]) . '%' . dechex($values[2]);
- $unicode_length += 9;
- } else {
- $unicode .= '%' . dechex($values[0]) . '%' . dechex($values[1]);
- $unicode_length += 6;
+ for ( $j = 0; $j < $num_octets; $j++ ) {
+ $unicode .= '%' . dechex( $values[ $j ] );
}
+ $unicode_length += $num_octets * 3;
+
$values = array();
$num_octets = 1;
}
@@ -1004,6 +1176,7 @@ function remove_accents($string) {
$string = strtr($string, $chars);
} else {
+ $chars = array();
// Assume ISO-8859-1 if not UTF-8
$chars['in'] = chr(128).chr(131).chr(138).chr(142).chr(154).chr(158)
.chr(159).chr(162).chr(165).chr(181).chr(192).chr(193).chr(194)
@@ -1019,6 +1192,7 @@ function remove_accents($string) {
$chars['out'] = "EfSZszYcYuAAAAAACEEEEIIIINOOOOOOUUUUYaaaaaaceeeeiiiinoooooouuuuyy";
$string = strtr($string, $chars['in'], $chars['out']);
+ $double_chars = array();
$double_chars['in'] = array(chr(140), chr(156), chr(198), chr(208), chr(222), chr(223), chr(230), chr(240), chr(254));
$double_chars['out'] = array('OE', 'oe', 'AE', 'DH', 'TH', 'ss', 'ae', 'dh', 'th');
$string = str_replace($double_chars['in'], $double_chars['out'], $string);
@@ -1054,10 +1228,10 @@ function sanitize_file_name( $filename ) {
*/
$special_chars = apply_filters( 'sanitize_file_name_chars', $special_chars, $filename_raw );
$filename = preg_replace( "#\x{00a0}#siu", ' ', $filename );
- $filename = str_replace($special_chars, '', $filename);
+ $filename = str_replace( $special_chars, '', $filename );
$filename = str_replace( array( '%20', '+' ), '-', $filename );
- $filename = preg_replace('/[\s-]+/', '-', $filename);
- $filename = trim($filename, '.-_');
+ $filename = preg_replace( '/[\r\n\t -]+/', '-', $filename );
+ $filename = trim( $filename, '.-_' );
// Split the filename into a base and extension[s]
$parts = explode('.', $filename);
@@ -1216,7 +1390,6 @@ function sanitize_title( $title, $fallback_title = '', $context = 'save' ) {
* Used for querying the database for a value from URL.
*
* @since 3.1.0
- * @uses sanitize_title()
*
* @param string $title The string to be sanitized.
* @return string The sanitized string.
@@ -1292,21 +1465,23 @@ function sanitize_title_with_dashes( $title, $raw_title = '', $context = 'displa
}
/**
- * Ensures a string is a valid SQL order by clause.
+ * Ensures a string is a valid SQL 'order by' clause.
+ *
+ * Accepts one or more columns, with or without a sort order (ASC / DESC).
+ * e.g. 'column_1', 'column_1, column_2', 'column_1 ASC, column_2 DESC' etc.
*
- * Accepts one or more columns, with or without ASC/DESC, and also accepts
- * RAND().
+ * Also accepts 'RAND()'.
*
* @since 2.5.1
*
- * @param string $orderby Order by string to be checked.
- * @return string|bool Returns the order by clause if it is a match, false otherwise.
+ * @param string $orderby Order by clause to be validated.
+ * @return string|bool Returns $orderby if valid, false otherwise.
*/
-function sanitize_sql_orderby( $orderby ){
- preg_match('/^\s*([a-z0-9_]+(\s+(ASC|DESC))?(\s*,\s*|\s*$))+|^\s*RAND\(\s*\)\s*$/i', $orderby, $obmatches);
- if ( !$obmatches )
- return false;
- return $orderby;
+function sanitize_sql_orderby( $orderby ) {
+ 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 ) ) {
+ return $orderby;
+ }
+ return false;
}
/**
@@ -1349,7 +1524,7 @@ function sanitize_html_class( $class, $fallback = '' ) {
/**
* Converts a number of characters from a string.
*
- * Metadata tags <> and <> are removed, <
> and <
> are
+ * Metadata tags `` and `` are removed, `
` and `
` are
* converted into correct XHTML and Unicode characters are converted to the
* valid range.
*
@@ -1483,7 +1658,7 @@ function force_balance_tags( $text ) {
// or close to be safe $tag = '/' . $tag;
}
// if stacktop value = tag close value then pop
- else if ( $tagstack[$stacksize - 1] == $tag ) { // found closing tag
+ elseif ( $tagstack[$stacksize - 1] == $tag ) { // found closing tag
$tag = '' . $tag . '>'; // Close Tag
// Pop
array_pop( $tagstack );
@@ -1740,7 +1915,7 @@ function rawurlencode_deep( $value ) {
*/
function antispambot( $email_address, $hex_encoding = 0 ) {
$email_no_spam_address = '';
- for ( $i = 0; $i < strlen( $email_address ); $i++ ) {
+ for ( $i = 0, $len = strlen( $email_address ); $i < $len; $i++ ) {
$j = rand( 0, 1 + $hex_encoding );
if ( $j == 0 ) {
$email_no_spam_address .= '' . ord( $email_address[$i] ) . ';';
@@ -1918,19 +2093,17 @@ function make_clickable( $text ) {
*
* Input string must have no null characters (or eventual transformations on output chunks must not care about null characters)
*
- *
- * _split_str_by_whitespace( "1234 67890 1234 67890a cd 1234 890 123456789 1234567890a 45678 1 3 5 7 90 ", 10 ) ==
- * array (
- * 0 => '1234 67890 ', // 11 characters: Perfect split
- * 1 => '1234 ', // 5 characters: '1234 67890a' was too long
- * 2 => '67890a cd ', // 10 characters: '67890a cd 1234' was too long
- * 3 => '1234 890 ', // 11 characters: Perfect split
- * 4 => '123456789 ', // 10 characters: '123456789 1234567890a' was too long
- * 5 => '1234567890a ', // 12 characters: Too long, but no inner whitespace on which to split
- * 6 => ' 45678 ', // 11 characters: Perfect split
- * 7 => '1 3 5 7 9', // 9 characters: End of $string
- * );
- *
+ * _split_str_by_whitespace( "1234 67890 1234 67890a cd 1234 890 123456789 1234567890a 45678 1 3 5 7 90 ", 10 ) ==
+ * array (
+ * 0 => '1234 67890 ', // 11 characters: Perfect split
+ * 1 => '1234 ', // 5 characters: '1234 67890a' was too long
+ * 2 => '67890a cd ', // 10 characters: '67890a cd 1234' was too long
+ * 3 => '1234 890 ', // 11 characters: Perfect split
+ * 4 => '123456789 ', // 10 characters: '123456789 1234567890a' was too long
+ * 5 => '1234567890a ', // 12 characters: Too long, but no inner whitespace on which to split
+ * 6 => ' 45678 ', // 11 characters: Perfect split
+ * 7 => '1 3 5 7 90 ', // 11 characters: End of $string
+ * );
*
* @since 3.4.0
* @access private
@@ -2004,7 +2177,7 @@ function wp_rel_nofollow_callback( $matches ) {
*
* Callback handler for {@link convert_smilies()}.
* Looks up one smiley code in the $wpsmiliestrans global array and returns an
- * string for that smiley.
+ * `` string for that smiley.
*
* @global array $wpsmiliestrans
* @since 2.8.0
@@ -2021,6 +2194,15 @@ function translate_smiley( $matches ) {
$smiley = trim( reset( $matches ) );
$img = $wpsmiliestrans[ $smiley ];
+ $matches = array();
+ $ext = preg_match( '/\.([^.]+)$/', $img, $matches ) ? strtolower( $matches[1] ) : false;
+ $image_exts = array( 'jpg', 'jpeg', 'jpe', 'gif', 'png' );
+
+ // Don't convert smilies that aren't images - they're probably emoji.
+ if ( ! in_array( $ext, $image_exts ) ) {
+ return $img;
+ }
+
/**
* Filter the Smiley image URL before it's used in the image element.
*
@@ -2032,7 +2214,7 @@ function translate_smiley( $matches ) {
*/
$src_url = apply_filters( 'smilies_src', includes_url( "images/smilies/$img" ), $img, site_url() );
- return sprintf( '', esc_url( $src_url ), esc_attr( $smiley ) );
+ return sprintf( '', esc_url( $src_url ), esc_attr( $smiley ) );
}
/**
@@ -2204,7 +2386,7 @@ function wp_iso_descrambler($string) {
* @access private
*
* @param array $match The preg_replace_callback matches array
- * @return array Converted chars
+ * @return string Converted chars
*/
function _wp_iso_convert( $match ) {
return chr( hexdec( strtolower( $match[1] ) ) );
@@ -2220,7 +2402,6 @@ function _wp_iso_convert( $match ) {
*
* @since 1.2.0
*
- * @uses get_option() to retrieve the value of 'gmt_offset'.
* @param string $string The date to be converted.
* @param string $format The format string for the returned date (default is Y-m-d H:i:s)
* @return string GMT version of the date provided.
@@ -2321,7 +2502,7 @@ function iso8601_to_datetime($date_string, $timezone = 'user') {
return gmdate('Y-m-d H:i:s', $timestamp);
- } else if ($timezone == 'user') {
+ } elseif ($timezone == 'user') {
return preg_replace('#([0-9]{4})([0-9]{2})([0-9]{2})T([0-9]{2}):([0-9]{2}):([0-9]{2})(Z|[\+|\-][0-9]{2,4}){0,1}#', '$1-$2-$3 $4:$5:$6', $date_string);
}
}
@@ -3013,8 +3194,6 @@ function esc_sql( $data ) {
* is applied to the returned cleaned URL.
*
* @since 2.8.0
- * @uses wp_kses_bad_protocol() To only permit protocols in the URL set
- * via $protocols or the common ones set in the function.
*
* @param string $url The URL to be cleaned.
* @param array $protocols Optional. An array of acceptable protocols.
@@ -3072,7 +3251,6 @@ function esc_url( $url, $protocols = null, $_context = 'display' ) {
* Performs esc_url() for database usage.
*
* @since 2.8.0
- * @uses esc_url()
*
* @param string $url The URL to be cleaned.
* @param array $protocols An array of acceptable protocols.
@@ -3229,12 +3407,13 @@ function tag_escape($tag_name) {
* beginning, so it isn't a true relative link, but from the web root base.
*
* @since 2.1.0
+ * @since 4.1.0 Support was added for relative URLs.
*
* @param string $link Full URL path.
* @return string Absolute path.
*/
function wp_make_link_relative( $link ) {
- return preg_replace( '|https?://[^/]+(/.*)|i', '$1', $link );
+ return preg_replace( '|^(https?:)?//[^/]+(/.*)|i', '$2', $link );
}
/**
@@ -3250,15 +3429,20 @@ function wp_make_link_relative( $link ) {
* @return string Sanitized value.
*/
function sanitize_option($option, $value) {
+ global $wpdb;
+ $error = '';
switch ( $option ) {
case 'admin_email' :
case 'new_admin_email' :
- $value = sanitize_email( $value );
- if ( ! is_email( $value ) ) {
- $value = get_option( $option ); // Resets option to stored value in the case of failed sanitization
- if ( function_exists( 'add_settings_error' ) )
- add_settings_error( $option, 'invalid_admin_email', __( 'The email address entered did not appear to be a valid email address. Please enter a valid email address.' ) );
+ $value = $wpdb->strip_invalid_text_for_column( $wpdb->options, 'option_value', $value );
+ if ( is_wp_error( $value ) ) {
+ $error = $value->get_error_message();
+ } else {
+ $value = sanitize_email( $value );
+ if ( ! is_email( $value ) ) {
+ $error = __( 'The email address entered did not appear to be a valid email address. Please enter a valid email address.' );
+ }
}
break;
@@ -3302,8 +3486,13 @@ function sanitize_option($option, $value) {
case 'blogdescription':
case 'blogname':
- $value = wp_kses_post( $value );
- $value = esc_html( $value );
+ $value = $wpdb->strip_invalid_text_for_column( $wpdb->options, 'option_value', $value );
+ if ( is_wp_error( $value ) ) {
+ $error = $value->get_error_message();
+ } else {
+ $value = wp_kses_post( $value );
+ $value = esc_html( $value );
+ }
break;
case 'blog_charset':
@@ -3324,8 +3513,13 @@ function sanitize_option($option, $value) {
case 'mailserver_login':
case 'mailserver_pass':
case 'upload_path':
- $value = strip_tags( $value );
- $value = wp_kses_data( $value );
+ $value = $wpdb->strip_invalid_text_for_column( $wpdb->options, 'option_value', $value );
+ if ( is_wp_error( $value ) ) {
+ $error = $value->get_error_message();
+ } else {
+ $value = strip_tags( $value );
+ $value = wp_kses_data( $value );
+ }
break;
case 'ping_sites':
@@ -3340,22 +3534,28 @@ function sanitize_option($option, $value) {
break;
case 'siteurl':
- if ( (bool)preg_match( '#http(s?)://(.+)#i', $value) ) {
- $value = esc_url_raw($value);
+ $value = $wpdb->strip_invalid_text_for_column( $wpdb->options, 'option_value', $value );
+ if ( is_wp_error( $value ) ) {
+ $error = $value->get_error_message();
} else {
- $value = get_option( $option ); // Resets option to stored value in the case of failed sanitization
- if ( function_exists('add_settings_error') )
- add_settings_error('siteurl', 'invalid_siteurl', __('The WordPress address you entered did not appear to be a valid URL. Please enter a valid URL.'));
+ if ( preg_match( '#http(s?)://(.+)#i', $value ) ) {
+ $value = esc_url_raw( $value );
+ } else {
+ $error = __( 'The WordPress address you entered did not appear to be a valid URL. Please enter a valid URL.' );
+ }
}
break;
case 'home':
- if ( (bool)preg_match( '#http(s?)://(.+)#i', $value) ) {
- $value = esc_url_raw($value);
+ $value = $wpdb->strip_invalid_text_for_column( $wpdb->options, 'option_value', $value );
+ if ( is_wp_error( $value ) ) {
+ $error = $value->get_error_message();
} else {
- $value = get_option( $option ); // Resets option to stored value in the case of failed sanitization
- if ( function_exists('add_settings_error') )
- add_settings_error('home', 'invalid_home', __('The Site address you entered did not appear to be a valid URL. Please enter a valid URL.'));
+ if ( preg_match( '#http(s?)://(.+)#i', $value ) ) {
+ $value = esc_url_raw( $value );
+ } else {
+ $error = __( 'The Site address you entered did not appear to be a valid URL. Please enter a valid URL.' );
+ }
}
break;
@@ -3370,45 +3570,59 @@ function sanitize_option($option, $value) {
break;
case 'illegal_names':
- if ( ! is_array( $value ) )
- $value = explode( ' ', $value );
+ $value = $wpdb->strip_invalid_text_for_column( $wpdb->options, 'option_value', $value );
+ if ( is_wp_error( $value ) ) {
+ $error = $value->get_error_message();
+ } else {
+ if ( ! is_array( $value ) )
+ $value = explode( ' ', $value );
- $value = array_values( array_filter( array_map( 'trim', $value ) ) );
+ $value = array_values( array_filter( array_map( 'trim', $value ) ) );
- if ( ! $value )
- $value = '';
+ if ( ! $value )
+ $value = '';
+ }
break;
case 'limited_email_domains':
case 'banned_email_domains':
- if ( ! is_array( $value ) )
- $value = explode( "\n", $value );
+ $value = $wpdb->strip_invalid_text_for_column( $wpdb->options, 'option_value', $value );
+ if ( is_wp_error( $value ) ) {
+ $error = $value->get_error_message();
+ } else {
+ if ( ! is_array( $value ) )
+ $value = explode( "\n", $value );
- $domains = array_values( array_filter( array_map( 'trim', $value ) ) );
- $value = array();
+ $domains = array_values( array_filter( array_map( 'trim', $value ) ) );
+ $value = array();
- foreach ( $domains as $domain ) {
- if ( ! preg_match( '/(--|\.\.)/', $domain ) && preg_match( '|^([a-zA-Z0-9-\.])+$|', $domain ) )
- $value[] = $domain;
+ foreach ( $domains as $domain ) {
+ if ( ! preg_match( '/(--|\.\.)/', $domain ) && preg_match( '|^([a-zA-Z0-9-\.])+$|', $domain ) ) {
+ $value[] = $domain;
+ }
+ }
+ if ( ! $value )
+ $value = '';
}
- if ( ! $value )
- $value = '';
break;
case 'timezone_string':
$allowed_zones = timezone_identifiers_list();
if ( ! in_array( $value, $allowed_zones ) && ! empty( $value ) ) {
- $value = get_option( $option ); // Resets option to stored value in the case of failed sanitization
- if ( function_exists('add_settings_error') )
- add_settings_error('timezone_string', 'invalid_timezone_string', __('The timezone you have entered is not valid. Please select a valid timezone.') );
+ $error = __( 'The timezone you have entered is not valid. Please select a valid timezone.' );
}
break;
case 'permalink_structure':
case 'category_base':
case 'tag_base':
- $value = esc_url_raw( $value );
- $value = str_replace( 'http://', '', $value );
+ $value = $wpdb->strip_invalid_text_for_column( $wpdb->options, 'option_value', $value );
+ if ( is_wp_error( $value ) ) {
+ $error = $value->get_error_message();
+ } else {
+ $value = esc_url_raw( $value );
+ $value = str_replace( 'http://', '', $value );
+ }
break;
case 'default_role' :
@@ -3418,13 +3632,25 @@ function sanitize_option($option, $value) {
case 'moderation_keys':
case 'blacklist_keys':
- $value = explode( "\n", $value );
- $value = array_filter( array_map( 'trim', $value ) );
- $value = array_unique( $value );
- $value = implode( "\n", $value );
+ $value = $wpdb->strip_invalid_text_for_column( $wpdb->options, 'option_value', $value );
+ if ( is_wp_error( $value ) ) {
+ $error = $value->get_error_message();
+ } else {
+ $value = explode( "\n", $value );
+ $value = array_filter( array_map( 'trim', $value ) );
+ $value = array_unique( $value );
+ $value = implode( "\n", $value );
+ }
break;
}
+ if ( ! empty( $error ) ) {
+ $value = get_option( $option );
+ if ( function_exists( 'add_settings_error' ) ) {
+ add_settings_error( $option, "invalid_{$option}", $error );
+ }
+ }
+
/**
* Filter an option value following sanitization.
*
@@ -3468,7 +3694,6 @@ function wp_parse_str( $string, &$array ) {
*
* KSES already converts lone greater than signs.
*
- * @uses wp_pre_kses_less_than_callback in the callback function.
* @since 2.3.0
*
* @param string $text Text to be converted.
@@ -3481,7 +3706,6 @@ function wp_pre_kses_less_than( $text ) {
/**
* Callback function used by preg_replace.
*
- * @uses esc_html to format the $matches text.
* @since 2.3.0
*
* @param array $matches Populated by matches to preg_replace.
@@ -3500,7 +3724,7 @@ function wp_pre_kses_less_than_callback( $matches ) {
* @link http://www.php.net/sprintf
*
* @param string $pattern The string which formatted args are inserted.
- * @param mixed $args,... Arguments to be formatted into the $pattern string.
+ * @param mixed $args ,... Arguments to be formatted into the $pattern string.
* @return string The formatted string.
*/
function wp_sprintf( $pattern ) {
@@ -3684,17 +3908,18 @@ function _links_add_base($m) {
return $m[1] . '=' . $m[2] .
( preg_match( '#^(\w{1,20}):#', $m[3], $protocol ) && in_array( $protocol[1], wp_allowed_protocols() ) ?
$m[3] :
- path_join( $_links_add_base, $m[3] ) )
+ WP_HTTP::make_absolute_url( $m[3], $_links_add_base )
+ )
. $m[2];
}
/**
* Adds a Target attribute to all links in passed content.
*
- * This function by default only applies to tags, however this can be
+ * This function by default only applies to `` tags, however this can be
* modified by the 3rd param.
*
- * NOTE: Any current target attributed will be stripped and replaced.
+ * *NOTE:* Any current target attributed will be stripped and replaced.
*
* @since 2.7.0
*
@@ -3745,7 +3970,7 @@ function normalize_whitespace( $str ) {
* Properly strip all HTML tags including script and style
*
* This differs from strip_tags() because it removes the contents of
- * the ' )
+ * the `' )`
* will return 'something'. wp_strip_all_tags will return ''
*
* @since 2.9.0
@@ -3992,3 +4217,302 @@ function wp_spaces_regexp() {
return $spaces;
}
+
+/**
+ * Print the important emoji-related styles.
+ *
+ * @since 4.2.0
+ */
+function print_emoji_styles() {
+ static $printed = false;
+
+ if ( $printed ) {
+ return;
+ }
+
+ $printed = true;
+?>
+
+ apply_filters( 'emoji_url', set_url_scheme( '//s.w.org/images/core/emoji/72x72/' ) ),
+
+ /**
+ * Filter the extension of the emoji files.
+ *
+ * @since 4.2.0
+ *
+ * @param string The emoji extension. Default .png.
+ */
+ 'ext' => apply_filters( 'emoji_ext', '.png' ),
+ );
+
+ $version = 'ver=' . $wp_version;
+ $develop_src = false !== strpos( $wp_version, '-src' );
+
+ if ( $develop_src || ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ) {
+ $settings['source'] = array(
+ /** This filter is documented in wp-includes/class.wp-scripts.php */
+ 'wpemoji' => apply_filters( 'script_loader_src', includes_url( "js/wp-emoji.js?$version" ), 'wpemoji' ),
+ /** This filter is documented in wp-includes/class.wp-scripts.php */
+ 'twemoji' => apply_filters( 'script_loader_src', includes_url( "js/twemoji.js?$version" ), 'twemoji' ),
+ );
+
+ ?>
+
+ apply_filters( 'script_loader_src', includes_url( "js/wp-emoji-release.min.js?$version" ), 'concatemoji' ),
+ );
+
+ /*
+ * If you're looking at a src version of this file, you'll see an "include"
+ * statement below. This is used by the `grunt build` process to directly
+ * include a minified version of wp-emoji-loader.js, instead of using the
+ * readfile() method from above.
+ *
+ * If you're looking at a build version of this file, you'll see a string of
+ * minified JavaScript. If you need to debug it, please turn on SCRIPT_DEBUG
+ * and edit wp-emoji-loader.js directly.
+ */
+ ?>
+
+ )/U', $text, -1, PREG_SPLIT_DELIM_CAPTURE );
+ $stop = count( $textarr );
+
+ // Ignore processing of specific tags.
+ $tags_to_ignore = 'code|pre|style|script|textarea';
+ $ignore_block_element = '';
+
+ for ( $i = 0; $i < $stop; $i++ ) {
+ $content = $textarr[$i];
+
+ // If we're in an ignore block, wait until we find its closing tag.
+ if ( '' == $ignore_block_element && preg_match( '/^<(' . $tags_to_ignore . ')>/', $content, $matches ) ) {
+ $ignore_block_element = $matches[1];
+ }
+
+ // If it's not a tag and not in ignore block.
+ if ( '' == $ignore_block_element && strlen( $content ) > 0 && '<' != $content[0] ) {
+ $matches = array();
+ if ( preg_match_all( '/(DZ(e[6-9a-f]|f[0-9a-f]);){2}/', $content, $matches ) ) {
+ if ( ! empty( $matches[0] ) ) {
+ foreach ( $matches[0] as $flag ) {
+ $chars = str_replace( array( '', ';'), '', $flag );
+
+ list( $char1, $char2 ) = str_split( $chars, 5 );
+ $entity = sprintf( '', $cdn_url . $char1 . '-' . $char2 . $ext, html_entity_decode( $flag ) );
+
+ $content = str_replace( $flag, $entity, $content );
+ }
+ }
+ }
+
+ // Loosely match the Emoji Unicode range.
+ $regex = '/([2-3][0-9a-f]{3};|[1-6][0-9a-f]{2};)/';
+
+ $matches = array();
+ if ( preg_match_all( $regex, $content, $matches ) ) {
+ if ( ! empty( $matches[1] ) ) {
+ foreach ( $matches[1] as $emoji ) {
+ $char = str_replace( array( '', ';'), '', $emoji );
+ $entity = sprintf( '', $cdn_url . $char . $ext, html_entity_decode( $emoji ) );
+
+ $content = str_replace( $emoji, $entity, $content );
+ }
+ }
+ }
+ }
+
+ // Did we exit ignore block.
+ if ( '' != $ignore_block_element && '' . $ignore_block_element . '>' == $content ) {
+ $ignore_block_element = '';
+ }
+
+ $output .= $content;
+ }
+
+ return $output;
+}
+
+/**
+ * Convert emoji in emails into static images.
+ *
+ * @since 4.2.0
+ *
+ * @param array $mail The email data array.
+ * @return array The email data array, with emoji in the message staticized.
+ */
+function wp_staticize_emoji_for_email( $mail ) {
+ if ( ! isset( $mail['message'] ) ) {
+ return $mail;
+ }
+
+ /*
+ * We can only transform the emoji into images if it's a text/html email.
+ * To do that, here's a cut down version of the same process that happens
+ * in wp_mail() - get the Content-Type from the headers, if there is one,
+ * then pass it through the wp_mail_content_type filter, in case a plugin
+ * is handling changing the Content-Type.
+ */
+ $headers = array();
+ if ( isset( $mail['headers'] ) ) {
+ if ( is_array( $mail['headers'] ) ) {
+ $headers = $mail['headers'];
+ } else {
+ $headers = explode( "\n", str_replace( "\r\n", "\n", $mail['headers'] ) );
+ }
+ }
+
+ foreach ( $headers as $header ) {
+ if ( strpos($header, ':') === false ) {
+ continue;
+ }
+
+ // Explode them out.
+ list( $name, $content ) = explode( ':', trim( $header ), 2 );
+
+ // Cleanup crew.
+ $name = trim( $name );
+ $content = trim( $content );
+
+ if ( 'content-type' === strtolower( $name ) ) {
+ if ( strpos( $content, ';' ) !== false ) {
+ list( $type, $charset ) = explode( ';', $content );
+ $content_type = trim( $type );
+ } else {
+ $content_type = trim( $content );
+ }
+ break;
+ }
+ }
+
+ // Set Content-Type if we don't have a content-type from the input headers.
+ if ( ! isset( $content_type ) ) {
+ $content_type = 'text/plain';
+ }
+
+ /** This filter is documented in wp-includes/pluggable.php */
+ $content_type = apply_filters( 'wp_mail_content_type', $content_type );
+
+ if ( 'text/html' === $content_type ) {
+ $mail['message'] = wp_staticize_emoji( $mail['message'] );
+ }
+
+ return $mail;
+}