Ticket #12870: 12870.diff

wp-admin/admin-ajax.php

@@ -1058 +1058 @@
         check_ajax_referer( 'samplepermalink', 'samplepermalinknonce' );
         $post_id = isset($_POST['post_id'])? intval($_POST['post_id']) : 0;
         $title = isset($_POST['new_title'])? $_POST['new_title'] : '';
-        $slug = isset($_POST['new_slug'])? $_POST['new_slug'] : '';
+        $slug = isset($_POST['new_slug'])? $_POST['new_slug'] : null;
         die(get_sample_permalink_html($post_id, $title, $slug));
 break;
 case 'inline-save':

wp-admin/includes/post.php

@@ -1026 +1026 @@
                 $post->post_status = 'publish';
                 $post->post_name = sanitize_title($post->post_name ? $post->post_name : $post->post_title, $post->ID);
         }
-
-        $post->post_name = wp_unique_post_slug($post->post_name, $post->ID, $post->post_status, $post->post_type, $post->post_parent);
-
+        
         // If the user wants to set a new name -- override the current one
         // Note: if empty name is supplied -- use the title instead, see #6072
         if ( !is_null($name) )
                 $post->post_name = sanitize_title($name ? $name : $title, $post->ID);
 
+        $post->post_name = wp_unique_post_slug($post->post_name, $post->ID, $post->post_status, $post->post_type, $post->post_parent);
+
         $post->filter = 'sample';
 
         $permalink = get_permalink($post, true);

wp-includes/link-template.php

@@ -271 +271 @@
         else
                 $post = &get_post($id);
 
-        $pagestruct = $wp_rewrite->get_page_permastruct();
+        $link = $wp_rewrite->get_page_permastruct();
 
-        if ( '' != $pagestruct && ( ( isset($post->post_status) && 'draft' != $post->post_status && 'pending' != $post->post_status ) || $sample ) ) {
-                $link = get_page_uri($id);
-                $link = ( $leavename ) ? $pagestruct : str_replace('%pagename%', $link, $pagestruct);
+        if ( '' != $link && ( ( isset($post->post_status) && 'draft' != $post->post_status && 'pending' != $post->post_status ) || $sample ) ) {
+                if ( ! $leavename )
+                        $link = str_replace('%pagename%', get_page_uri($id), $link);
                 $link = home_url($link);
                 $link = user_trailingslashit($link, 'page');
         } else {