Ticket #19292: 19292.2.diff

wp-admin/js/post.dev.js

@@ -547 +547 @@
                         b.html('<a href="#" class="save button">'+postL10n.ok+'</a> <a class="cancel" href="#">'+postL10n.cancel+'</a>');
                         b.children('.save').click(function() {
                                 var new_slug = e.children('input').val();
+                                if ( new_slug == $('#editable-post-name-full').text() ) {
+                                        return $('.cancel', '#edit-slug-buttons').click();
+                                }
                                 $.post(ajaxurl, {
                                         action: 'sample-permalink',
                                         post_id: post_id,

wp-includes/post.php

@@ -2490 +2490 @@
                 else
                         $post_name = '';
         } else {
-                $post_name = sanitize_title($post_name);
+                // On updates, we need to check to see if it's using an old sanitization context, or the newer Save context
+                $check_name = sanitize_title( $post_name, '', 'query'); // sanitize_title_for_query(), but spelt out here for readability
+                if ( $update && strtolower( urlencode( $post_name ) ) == $check_name && get_post_field( 'post_name', $ID ) == $check_name )
+                        $post_name = $check_name;
+                else // slug has changed or uses newer (default) sanitization
+                        $post_name = sanitize_title($post_name);
         }
 
         // 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
@@ -3153 +3158 @@
         $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;