Ticket #19292: 19292.diff

wp-includes/post.php

@@ -2485 +2485 @@
         // Create a valid post name.  Drafts and pending posts are allowed to have an empty
         // post name.
         if ( empty($post_name) ) {
+                $sanitize_context = $update && is_post_type_hierarchical( $post_type ) ? '' : 'save';
                 if ( !in_array( $post_status, array( 'draft', 'pending', 'auto-draft' ) ) )
-                        $post_name = sanitize_title($post_title);
+                        $post_name = sanitize_title($post_title, '', $sanitize_context );
                 else
                         $post_name = '';
         } else {
-                $post_name = sanitize_title($post_name);
+                $post_name = sanitize_title( $post_name, '', $sanitize_context );
         }
 
         // If the post date is empty (due to having been new or a draft) and status is not 'draft' or 'pending', set date to now
@@ -2594 +2595 @@
         }
 
         if ( empty($data['post_name']) && !in_array( $data['post_status'], array( 'draft', 'pending', 'auto-draft' ) ) ) {
-                $data['post_name'] = sanitize_title($data['post_title'], $post_ID);
+                $data['post_name'] = sanitize_title($data['post_title'], $post_ID, $update && is_post_type_hierarchical( get_post_type( $post_ID ) ) ? '' : 'save' );
                 $wpdb->update( $wpdb->posts, array( 'post_name' => $data['post_name'] ), $where );
         }
 
@@ -3153 +3154 @@
         $page_path = str_replace('%20', ' ', $page_path);
         $parts = explode( '/', trim( $page_path, '/' ) );
         $parts = array_map( 'esc_sql', $parts );
-        $parts = array_map( 'sanitize_title', $parts );
+        $parts = array_map( 'sanitize_title_for_query', $parts );
 
         $in_string = "'". implode( "','", $parts ) . "'";
         $post_type_sql = $post_type;