Ticket #16477: 16477.diff

wp-admin/includes/post.php

@@ -1119 +1119 @@
 function get_sample_permalink_html( $id, $new_title = null, $new_slug = null ) {
         global $wpdb;
         $post = &get_post($id);
+        $currently_saved_permalink = get_permalink( $id );
 
         list($permalink, $post_name) = get_sample_permalink($post->ID, $new_title, $new_slug);
 
@@ -1135 +1136 @@
                 if ( '' == get_option( 'permalink_structure' ) && current_user_can( 'manage_options' ) && !( 'page' == get_option('show_on_front') && $id == get_option('page_on_front') ) )
                         $return .= '<span id="change-permalinks"><a href="options-permalink.php" class="button" target="_blank">' . __('Change Permalinks') . "</a></span>\n";
                 if ( isset($view_post) )
-                        $return .= "<span id='view-post-btn'><a href='$permalink' class='button' target='_blank'>$view_post</a></span>\n";
+                        $return .= "<span id='view-post-btn'><a href='$currently_saved_permalink' class='button' target='_blank'>$view_post</a></span>\n";
 
                 $return = apply_filters('get_sample_permalink_html', $return, $id, $new_title, $new_slug);
 
@@ -1158 +1159 @@
 
         $post_name_html = '<span id="editable-post-name" title="' . $title . '">' . $post_name_abridged . '</span>';
         $display_link = str_replace(array('%pagename%','%postname%'), $post_name_html, $permalink);
-        $view_link = str_replace(array('%pagename%','%postname%'), $post_name, $permalink);
         $return =  '<strong>' . __('Permalink:') . "</strong>\n";
         $return .= '<span id="sample-permalink">' . $display_link . "</span>\n";
         $return .= '&lrm;'; // Fix bi-directional text display defect in RTL languages.
         $return .= '<span id="edit-slug-buttons"><a href="#post_name" class="edit-slug button hide-if-no-js" onclick="editPermalink(' . $id . '); return false;">' . __('Edit') . "</a></span>\n";
         $return .= '<span id="editable-post-name-full">' . $post_name . "</span>\n";
         if ( isset($view_post) )
-                $return .= "<span id='view-post-btn'><a href='$view_link' class='button' target='_blank'>$view_post</a></span>\n";
+                $return .= "<span id='view-post-btn'><a href='$currently_saved_permalink' class='button' target='_blank'>$view_post</a></span>\n";
 
         $return = apply_filters('get_sample_permalink_html', $return, $id, $new_title, $new_slug);