Changeset 12504 for trunk/wp-includes/formatting.php

Timestamp:

12/23/2009 11:00:29 AM (16 years ago)

Author:

westi

Message:

Only run a second spaces strip if we replaced some octets. Also only replace spaces and we have already removed the other whitespace chars. Fixes #11573 props azaozz.

File:

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

trunk/wp-includes/formatting.php

@@ -2842 +2842 @@
 
     $match = array();
+    $found = false;
     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) );
+        $found = true;
+    }
+
+    if ( $found ) {
+        // Strip out the whitespace that may now exist after removing the octets.
+        $filtered = trim( preg_replace('/ +/', ' ', $filtered) );
+    }
 
     return apply_filters('sanitize_text_field', $filtered, $str);