Ticket #9591: 9591.diff

wp-includes/query.php

@@ -1402 +1402 @@
                         if ( !is_array($qv['tag_slug__in']) || empty($qv['tag_slug__in']) ) {
                                 $qv['tag_slug__in'] = array();
                         } else {
-                                $qv['tag_slug__in'] = array_map('sanitize_title', $qv['tag_slug__in']);
+                                $qv['tag_slug__in'] = array_map('sanitize_title_for_query', $qv['tag_slug__in']);
                                 $this->is_tag = true;
                         }
 
                         if ( !is_array($qv['tag_slug__and']) || empty($qv['tag_slug__and']) ) {
                                 $qv['tag_slug__and'] = array();
                         } else {
-                                $qv['tag_slug__and'] = array_map('sanitize_title', $qv['tag_slug__and']);
+                                $qv['tag_slug__and'] = array_map('sanitize_title_for_query', $qv['tag_slug__and']);
                                 $this->is_tag = true;
                         }
 
@@ -1707 +1707 @@
                         $where .= " AND DAYOFMONTH($wpdb->posts.post_date)='" . $q['day'] . "'";
 
                 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'] . "'";
                 } else if ('' != $q['pagename']) {
                         if ( isset($this->queried_object_id) )
@@ -1724 +1724 @@
                         if  ( ('page' != get_option('show_on_front') ) ||  empty($page_for_posts) || ( $reqpage != $page_for_posts ) ) {
                                 $q['pagename'] = str_replace('%2F', '/', urlencode(urldecode($q['pagename'])));
                                 $page_paths = '/' . trim($q['pagename'], '/');
-                                $q['pagename'] = sanitize_title(basename($page_paths));
+                                $q['pagename'] = sanitize_title_for_query(basename($page_paths));
                                 $q['name'] = $q['pagename'];
                                 $where .= " AND ($wpdb->posts.ID = '$reqpage')";
                                 $reqpage_obj = get_page($reqpage);
@@ -1737 +1737 @@
                 } elseif ('' != $q['attachment']) {
                         $q['attachment'] = str_replace('%2F', '/', urlencode(urldecode($q['attachment'])));
                         $attach_paths = '/' . trim($q['attachment'], '/');
-                        $q['attachment'] = sanitize_title(basename($attach_paths));
+                        $q['attachment'] = sanitize_title_for_query(basename($attach_paths));
                         $q['name'] = $q['attachment'];
                         $where .= " AND $wpdb->posts.post_name = '" . $q['attachment'] . "'";
                 }
@@ -1844 +1844 @@
 
                 // Category stuff for nice URLs
                 if ( '' != $q['category_name'] && !$this->is_singular ) {
-                        $q['category_name'] = implode('/', array_map('sanitize_title', explode('/', $q['category_name'])));
+                        $q['category_name'] = implode('/', array_map('sanitize_title_for_query', explode('/', $q['category_name'])));
                         $reqcat = get_category_by_path($q['category_name']);
                         $q['category_name'] = str_replace('%2F', '/', urlencode(urldecode($q['category_name'])));
                         $cat_paths = '/' . trim($q['category_name'], '/');
-                        $q['category_name'] = sanitize_title(basename($cat_paths));
+                        $q['category_name'] = sanitize_title_for_query(basename($cat_paths));
 
                         $cat_paths = '/' . trim(urldecode($q['category_name']), '/');
-                        $q['category_name'] = sanitize_title(basename($cat_paths));
+                        $q['category_name'] = sanitize_title_for_query(basename($cat_paths));
                         $cat_paths = explode('/', $cat_paths);
                         $cat_path = '';
                         foreach ( (array) $cat_paths as $pathdir )
-                                $cat_path .= ( $pathdir != '' ? '/' : '' ) . sanitize_title($pathdir);
+                                $cat_path .= ( $pathdir != '' ? '/' : '' ) . sanitize_title_for_query($pathdir);
 
                         //if we don't match the entire hierarchy fallback on just matching the nicename
                         if ( empty($reqcat) )
@@ -2027 +2027 @@
                                         $q['author_name'] = $q['author_name'][count($q['author_name'])-2];#there was a trailling slash
                                 }
                         }
-                        $q['author_name'] = sanitize_title($q['author_name']);
+                        $q['author_name'] = sanitize_title_for_query($q['author_name']);
                         $q['author'] = $wpdb->get_var("SELECT ID FROM $wpdb->users WHERE user_nicename='".$q['author_name']."'");
                         $q['author'] = get_user_by('slug', $q['author_name']);
                         if ( $q['author'] )

wp-includes/formatting.php

@@ -628 +628 @@
                 chr(197).chr(186) => 'z', chr(197).chr(187) => 'Z',
                 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',
                 // GBP (Pound) Sign
@@ -761 +762 @@
  *
  * @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 )
                 $title = $fallback_title;
 
         return $title;
 }
 
+function sanitize_title_for_query($title) {
+        return sanitize_title($title, '', 'query');
+}
+
 /**
  * Sanitizes title, replacing whitespace with dashes.
  *
@@ -794 +803 @@
         // Restore octets.
         $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')) {
                         $title = mb_strtolower($title, 'UTF-8');