Changeset 15929

Timestamp:

10/23/2010 12:55:55 PM (14 years ago)

Author:

scribu

Message:

Introduce sanitize_title_for_query(). See #9591

Location:

trunk/wp-includes

Files:

• formatting.php (modified) (4 diffs)
• query.php (modified) (4 diffs)
• taxonomy.php (modified) (1 diff)

trunk/wp-includes/formatting.php

@@ -629 +629 @@
         chr(197).chr(188) => 'z', chr(197).chr(189) => 'Z',
         chr(197).chr(190) => 'z', chr(197).chr(191) => 's',
+        chr(200).chr(153) => 's', chr(200).chr(155) => 't',
         // Euro Sign
         chr(226).chr(130).chr(172) => 'E',
@@ -784 +785 @@
  * @param string $title The string to be sanitized.
  * @param string $fallback_title Optional. A title to use if $title is empty.
+ * @param string $context Optional. The operation for which the string is sanitized
  * @return string The sanitized string.
  */
-function sanitize_title($title, $fallback_title = '') {
+function sanitize_title($title, $fallback_title = '', $context = 'save') {
     $raw_title = $title;
-    $title = strip_tags($title);
-    $title = apply_filters('sanitize_title', $title, $raw_title);
+
+    if ( 'save' == $context )
+        $title = remove_accents($title);
+
+    $title = apply_filters('sanitize_title', $title, $raw_title, $context);
 
     if ( '' === $title || false === $title )
@@ -795 +800 @@
 
     return $title;
+}
+
+function sanitize_title_for_query($title) {
+    return sanitize_title($title, '', 'query');
 }
 
@@ -817 +826 @@
     $title = preg_replace('|---([a-fA-F0-9][a-fA-F0-9])---|', '%$1', $title);
 
-    $title = remove_accents($title);
     if (seems_utf8($title)) {
         if (function_exists('mb_strtolower')) {

trunk/wp-includes/query.php

@@ -1785 +1785 @@
 
         if ( '' != $q['name'] ) {
-            $q['name'] = sanitize_title( $q['name'] );
+            $q['name'] = sanitize_title_for_query( $q['name'] );
             $where .= " AND $wpdb->posts.post_name = '" . $q['name'] . "'";
         } elseif ( '' != $q['pagename'] ) {
@@ -1813 +1813 @@
             $page_for_posts = get_option('page_for_posts');
             if  ( ('page' != get_option('show_on_front') ) || empty($page_for_posts) || ( $reqpage != $page_for_posts ) ) {
-                $q['pagename'] = sanitize_title( $this->_qv_basename( $q['pagename'] ) );
+                $q['pagename'] = sanitize_title_for_query( $this->_qv_basename( $q['pagename'] ) );
                 $q['name'] = $q['pagename'];
                 $where .= " AND ($wpdb->posts.ID = '$reqpage')";
@@ -1825 +1825 @@
             }
         } elseif ( '' != $q['attachment'] ) {
-            $q['attachment'] = sanitize_title( $this->_qv_basename( $q['attachment'] ) );
+            $q['attachment'] = sanitize_title_for_query( $this->_qv_basename( $q['attachment'] ) );
             $q['name'] = $q['attachment'];
             $where .= " AND $wpdb->posts.post_name = '" . $q['attachment'] . "'";
@@ -1958 +1958 @@
                 }
             }
-            $q['author_name'] = sanitize_title( $q['author_name'] );
+            $q['author_name'] = sanitize_title_for_query( $q['author_name'] );
             $q['author'] = get_user_by('slug', $q['author_name']);
             if ( $q['author'] )

trunk/wp-includes/taxonomy.php

@@ -535 +535 @@
         case 'name':
             foreach ( $terms as $i => $term ) {
-                $terms[$i] = sanitize_term_field('slug', $term, 0, $taxonomy, 'db');
+                $terms[$i] = sanitize_title_for_query( $term );
             }
             $terms = array_filter($terms);