Changes from branches/3.1/wp-includes/formatting.php at r18031 to trunk/wp-includes/formatting.php at r18159

File:

• trunk/wp-includes/formatting.php (modified) (12 diffs)

trunk/wp-includes/formatting.php

@@ -29 +29 @@
 function wptexturize($text) {
     global $wp_cockneyreplace;
-    static $static_setup = false, $opening_quote, $closing_quote, $default_no_texturize_tags, $default_no_texturize_shortcodes, $static_characters, $static_replacements, $dynamic_characters, $dynamic_replacements;
-    $output = '';
-    $curl = '';
-    $textarr = preg_split('/(<.*>|\[.*\])/Us', $text, -1, PREG_SPLIT_DELIM_CAPTURE);
-    $stop = count($textarr);
-
-    // No need to set up these variables more than once
-    if (!$static_setup) {
+    static $opening_quote, $closing_quote, $default_no_texturize_tags, $default_no_texturize_shortcodes, $static_characters, $static_replacements, $dynamic_characters, $dynamic_replacements;
+
+    // No need to set up these static variables more than once
+    if ( empty( $opening_quote ) ) {
         /* translators: opening curly quote */
         $opening_quote = _x('&#8220;', 'opening curly quote');
@@ -59 +55 @@
         $dynamic_characters = array('/\'(\d\d(?:&#8217;|\')?s)/', '/\'(\d)/', '/(\s|\A|[([{<]|")\'/', '/(\d)"/', '/(\d)\'/', '/(\S)\'([^\'\s])/', '/(\s|\A|[([{<])"(?!\s)/', '/"(\s|\S|\Z)/', '/\'([\s.]|\Z)/', '/\b(\d+)x(\d+)\b/');
         $dynamic_replacements = array('&#8217;$1','&#8217;$1', '$1&#8216;', '$1&#8243;', '$1&#8242;', '$1&#8217;$2', '$1' . $opening_quote . '$2', $closing_quote . '$1', '&#8217;$1', '$1&#215;$2');
-
-        $static_setup = true;
     }
 
@@ -71 +65 @@
     $no_texturize_shortcodes_stack = array();
 
-    for ( $i = 0; $i < $stop; $i++ ) {
-        $curl = $textarr[$i];
-
-        if ( !empty($curl) && '<' != $curl[0] && '[' != $curl[0]
-                && empty($no_texturize_shortcodes_stack) && empty($no_texturize_tags_stack)) {
-            // This is not a tag, nor is the texturization disabled
-            // static strings
+    $textarr = preg_split('/(<.*>|\[.*\])/Us', $text, -1, PREG_SPLIT_DELIM_CAPTURE);
+
+    foreach ( $textarr as &$curl ) {
+        if ( empty( $curl ) )
+            continue;
+
+        // Only call _wptexturize_pushpop_element if first char is correct tag opening
+        $first = $curl[0];
+        if ( '<' === $first ) {
+            _wptexturize_pushpop_element($curl, $no_texturize_tags_stack, $no_texturize_tags, '<', '>');
+        } elseif ( '[' === $first ) {
+            _wptexturize_pushpop_element($curl, $no_texturize_shortcodes_stack, $no_texturize_shortcodes, '[', ']');
+        } elseif ( empty($no_texturize_shortcodes_stack) && empty($no_texturize_tags_stack) ) {
+            // This is not a tag, nor is the texturization disabled static strings
             $curl = str_replace($static_characters, $static_replacements, $curl);
             // regular expressions
             $curl = preg_replace($dynamic_characters, $dynamic_replacements, $curl);
-        } elseif (!empty($curl)) {
-            /*
-             * Only call _wptexturize_pushpop_element if first char is correct
-             * tag opening
-             */
-            if ('<' == $curl[0])
-                _wptexturize_pushpop_element($curl, $no_texturize_tags_stack, $no_texturize_tags, '<', '>');
-            elseif ('[' == $curl[0])
-                _wptexturize_pushpop_element($curl, $no_texturize_shortcodes_stack, $no_texturize_shortcodes, '[', ']');
         }
-
         $curl = preg_replace('/&([^#])(?![a-zA-Z1-4]{1,8};)/', '&#038;$1', $curl);
-        $output .= $curl;
-    }
-
-    return $output;
+    }
+    return implode( '', $textarr );
 }
 
@@ -574 +563 @@
         chr(195).chr(178) => 'o', chr(195).chr(179) => 'o',
         chr(195).chr(180) => 'o', chr(195).chr(181) => 'o',
-        chr(195).chr(182) => 'o', chr(195).chr(182) => 'o',
+        chr(195).chr(182) => 'o', chr(195).chr(184) => 'o',
         chr(195).chr(185) => 'u', chr(195).chr(186) => 'u',
         chr(195).chr(187) => 'u', chr(195).chr(188) => 'u',
@@ -877 +866 @@
  * Santizes a html classname to ensure it only contains valid characters
  *
- * Strips the string down to A-Z,a-z,0-9,'-' if this results in an empty
+ * Strips the string down to A-Z,a-z,0-9,_,-. If this results in an empty
  * string then it will return the alternative value supplied.
  *
@@ -891 +880 @@
 function sanitize_html_class( $class, $fallback = '' ) {
     //Strip out any % encoded octets
-    $sanitized = preg_replace('|%[a-fA-F0-9][a-fA-F0-9]|', '', $class);
-
-    //Limit to A-Z,a-z,0-9,'-'
-    $sanitized = preg_replace('/[^A-Za-z0-9-]/', '', $sanitized);
+    $sanitized = preg_replace( '|%[a-fA-F0-9][a-fA-F0-9]|', '', $class );
+
+    //Limit to A-Z,a-z,0-9,_,-
+    $sanitized = preg_replace( '/[^A-Za-z0-9_-]/', '', $sanitized );
 
     if ( '' == $sanitized )
@@ -1239 +1228 @@
  * @since 2.0.0
  *
- * @param array|string $value The array or string to be striped.
+ * @param array|string $value The array or string to be stripped.
  * @return array|string Stripped array (or string in the callback).
  */
@@ -1600 +1589 @@
  * Requires and returns a date in the Y-m-d H:i:s format. Simply subtracts the
  * value of the 'gmt_offset' option. Return format can be overridden using the
- * $format parameter. If PHP5 is supported, the function uses the DateTime and
- * DateTimeZone objects to respect time zone differences in DST.
+ * $format parameter. The DateTime and DateTimeZone classes are used to respect
+ * time zone differences in DST.
  *
  * @since 1.2.0
@@ -1613 +1602 @@
     preg_match('#([0-9]{1,4})-([0-9]{1,2})-([0-9]{1,2}) ([0-9]{1,2}):([0-9]{1,2}):([0-9]{1,2})#', $string, $matches);
     $tz = get_option('timezone_string');
-    if( class_exists('DateTime') && $tz ) {
-        //PHP5
+    if ( $tz ) {
         date_default_timezone_set( $tz );
         $datetime = new DateTime( $string );
@@ -1623 +1611 @@
 
         date_default_timezone_set('UTC');
-    }
-    else {
-        //PHP4
+    } else {
         $string_time = gmmktime($matches[4], $matches[5], $matches[6], $matches[2], $matches[3], $matches[1]);
         $string_gmt = gmdate($format, $string_time - get_option('gmt_offset') * 3600);
@@ -2679 +2665 @@
     // Translate and filter the delimiter set (avoid ampersands and entities here)
     $l = apply_filters('wp_sprintf_l', array(
-        /* translators: used between list items, there is a space after the coma */
+        /* translators: used between list items, there is a space after the comma */
         'between'          => __(', '),
         /* translators: used between list items, there is a space after the and */
@@ -2770 +2756 @@
  * modified by the 3rd param.
  *
- * <b>NOTE:</b> Any current target attributed will be striped and replaced.
+ * <b>NOTE:</b> Any current target attributed will be stripped and replaced.
  *
  * @since 2.7.0