Changeset 12503

Timestamp:

12/23/2009 09:52:48 AM (17 years ago)

Author:

westi

Message:

Improve sanitize_text_field() some more so that we don't leave extra whitespace after stripping octets. Fixes #11573.

File:

• trunk/wp-includes/formatting.php (modified) (1 diff)

trunk/wp-includes/formatting.php

@@ -2835 +2835 @@
         if ( strpos($filtered, '<') !== false ) {
                 $filtered = wp_pre_kses_less_than( $filtered );
+                // This will strip extra whitespace for us.
                 $filtered = wp_strip_all_tags( $filtered, true );
         } else {
-                 $filtered = trim( preg_replace('/[\r\n\t ]+/', ' ', $filtered) );
+                $filtered = trim( preg_replace('/[\r\n\t ]+/', ' ', $filtered) );
         }
 
         $match = array();
-        while ( preg_match('/%[a-f0-9]{2}/i', $filtered, $match) )
+        while ( preg_match('/%[a-f0-9]{2}/i', $filtered, $match) ) {
                 $filtered = str_replace($match[0], '', $filtered);
+        }
+        // Strip out the whitespace that may now exist after removing the octets.
+        $filtered = trim( preg_replace('/[\r\n\t ]+/', ' ', $filtered) );
 
         return apply_filters('sanitize_text_field', $filtered, $str);