Changeset 15635

Timestamp:

09/20/2010 03:28:58 PM (16 years ago)

Author:

ryan

Message:

Simplify sanitize_key() and use it in more places. see #14910

Location:

trunk/wp-includes

Files:

• formatting.php (modified) (1 diff)
• post.php (modified) (2 diffs)
• query.php (modified) (1 diff)

trunk/wp-includes/formatting.php

@@ -764 +764 @@
 function sanitize_key( $key ) {
         $raw_key = $key;
-        $key = wp_strip_all_tags($key);
-        // Kill octets
-        $key = preg_replace('|%([a-fA-F0-9][a-fA-F0-9])|', '', $key);
-        $key = preg_replace('/&.+?;/', '', $key); // Kill entities
 
         $key = preg_replace('|[^a-z0-9 _.\-@]|i', '', $key);

trunk/wp-includes/post.php

@@ -572 +572 @@
         $args = (object) $args;
 
-        $post_status = sanitize_user($post_status, true);
+        $post_status = sanitize_key($post_status);
         $args->name = $post_status;
 
@@ -820 +820 @@
         $args = (object) $args;
 
-        $post_type = sanitize_user($post_type, true);
+        $post_type = sanitize_key($post_type);
         $args->name = $post_type;
 

trunk/wp-includes/query.php

@@ -1457 +1457 @@
                 if ( !empty($qv['post_type']) ) {
                         if ( is_array($qv['post_type']) )
-                                $qv['post_type'] = array_map('sanitize_user', $qv['post_type'], array(true));
+                                $qv['post_type'] = array_map('sanitize_key', $qv['post_type']);
                         else
-                                $qv['post_type'] = sanitize_user($qv['post_type'], true);
+                                $qv['post_type'] = sanitize_key($qv['post_type']);
                 }