Ticket #16478: 16478-better.diff

wp-admin/includes/post.php

@@ -1122 +1122 @@
 
         list($permalink, $post_name) = get_sample_permalink($post->ID, $new_title, $new_slug);
 
-        if ( 'publish' == $post->post_status ) {
-                $ptype = get_post_type_object($post->post_type);
-                $view_post = $ptype->labels->view_item;
-                $title = __('Click to edit this part of the permalink');
-        } else {
-                $title = __('Temporary permalink. Click to edit this part.');
-        }
-
+        $title = ( 'publish' == $post->post_status ) ? __('Click to edit this part of the permalink') : __('Temporary permalink. Click to edit this part.');
+        
         if ( false === strpos($permalink, '%postname%') && false === strpos($permalink, '%pagename%') ) {
                 $return = '<strong>' . __('Permalink:') . "</strong>\n" . '<span id="sample-permalink">' . $permalink . "</span>\n";
                 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 = apply_filters('get_sample_permalink_html', $return, $id, $new_title, $new_slug);
 
@@ -1158 +1150 @@
 
         $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 = apply_filters('get_sample_permalink_html', $return, $id, $new_title, $new_slug);
 

wp-admin/js/post.dev.js

@@ -554 +554 @@
                                         new_title: $('#title').val(),
                                         samplepermalinknonce: $('#samplepermalinknonce').val()
                                 }, function(data) {
-                                        $('#edit-slug-box').html(data);
+                                        $('#sample-permalink-wrap').html(data);
                                         b.html(revert_b);
                                         real_slug.attr('value', new_slug);
                                         makeSlugeditClickable();

wp-admin/edit-form-advanced.php

@@ -248 +248 @@
 </div>
 <div class="inside">
 <?php
-$sample_permalink_html = ! empty( $post_type_object->publicly_queryable ) ? get_sample_permalink_html($post->ID) : '';
+$sample_permalink_html = ! empty( $post_type_object->publicly_queryable ) ? '<span id="sample-permalink-wrap">' . get_sample_permalink_html($post->ID) . '</span>' : '';
+$sample_permalink_html .= "<span id='view-post-btn'><a href='" . get_permalink( $post_ID ). "' class='button' target='_blank'>{$post_type_object->labels->view_item}</a></span>\n";
+
 $shortlink = wp_get_shortlink($post->ID, 'post');
 if ( !empty($shortlink) )
     $sample_permalink_html .= '<input id="shortlink" type="hidden" value="' . esc_attr($shortlink) . '" /><a href="#" class="button" onclick="prompt(&#39;URL:&#39;, jQuery(\'#shortlink\').val()); return false;">' . __('Get Shortlink') . '</a>';