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

Timestamp:

10/24/2010 08:33:54 PM (14 years ago)

Author:

ryan

Message:

Idempotence for sanitize_user(). Make sanitize_key() match its phpdoc. Props duck_ fixes #15198

File:

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

trunk/wp-includes/formatting.php

@@ -725 +725 @@
  * Sanitize username stripping out unsafe characters.
  *
- * If $strict is true, only alphanumeric characters (as well as _, space, ., -,
- * @) are returned.
- * Removes tags, octets, entities, and if strict is enabled, will remove all
- * non-ASCII characters. After sanitizing, it passes the username, raw username
- * (the username in the parameter), and the strict parameter as parameters for
- * the filter.
+ * Removes tags, octets, entities, and if strict is enabled, will only keep
+ * alphanumeric, _, space, ., -, @. After sanitizing, it passes the username, 
+ * raw username (the username in the parameter), and the value of $strict as
+ * parameters for the 'sanitize_user' filter.
  *
  * @since 2.0.0
@@ -752 +750 @@
         $username = preg_replace( '|[^a-z0-9 _.\-@]|i', '', $username );
 
+    $username = trim( $username );
     // Consolidate contiguous whitespace
     $username = preg_replace( '|\s+|', ' ', $username );
@@ -761 +760 @@
  * Sanitize a string key.
  *
- * Keys are used as internal identifiers. They should be lowercase ASCII.  Dashes and underscores are allowed.
+ * Keys are used as internal identifiers. Lowercase alphanumeric characters, dashes and underscores are allowed.
  *
  * @since 3.0.0
@@ -770 +769 @@
 function sanitize_key( $key ) {
     $raw_key = $key;
-
-    $key = preg_replace('|[^a-z0-9 _.\-@]|i', '', $key);
-
-    // Consolidate contiguous whitespace
-    $key = preg_replace('|\s+|', ' ', $key);
-
-    return apply_filters('sanitize_key', $key, $raw_key);
+    $key = strtolower( $key );
+    $key = preg_replace( '/[^a-z0-9_\-]/', '', $key );
+    return apply_filters( 'sanitize_key', $key, $raw_key );
 }