diff --git wp-admin/css/wp-admin.dev.css wp-admin/css/wp-admin.dev.css
index b9eea7f..30588ca 100644
--- wp-admin/css/wp-admin.dev.css
+++ wp-admin/css/wp-admin.dev.css
@@ -2801,6 +2801,10 @@ input#link_url {
padding: 0 7px;
}
+#sample-permalink a {
+ text-decoration: none;
+}
+
#editable-post-name-full {
display: none;
}
diff --git wp-admin/includes/post.php wp-admin/includes/post.php
index 9098d2f..f39b212 100644
--- wp-admin/includes/post.php
+++ wp-admin/includes/post.php
@@ -1130,11 +1130,12 @@ function get_sample_permalink_html( $id, $new_title = null, $new_slug = null ) {
}
if ( false === strpos($permalink, '%postname%') && false === strpos($permalink, '%pagename%') ) {
+ if ( isset( $view_post ) )
+ $permalink = "$permalink";
+
$return = '' . __('Permalink:') . "\n" . '' . $permalink . "\n";
if ( '' == get_option( 'permalink_structure' ) && current_user_can( 'manage_options' ) && !( 'page' == get_option('show_on_front') && $id == get_option('page_on_front') ) )
$return .= '' . __('Change Permalinks') . "\n";
- if ( isset($view_post) )
- $return .= "$view_post\n";
$return = apply_filters('get_sample_permalink_html', $return, $id, $new_title, $new_slug);
@@ -1155,17 +1156,17 @@ function get_sample_permalink_html( $id, $new_title = null, $new_slug = null ) {
}
}
- $post_name_html = '' . $post_name_abridged . '';
+ $post_name_html = '' . $post_name_abridged . '';
$display_link = str_replace(array('%pagename%','%postname%'), $post_name_html, $permalink);
$view_link = str_replace(array('%pagename%','%postname%'), $post_name, $permalink);
+ if ( isset( $view_post ) )
+ $display_link = "$display_link";
+
$return = '' . __('Permalink:') . "\n";
$return .= '' . $display_link . "\n";
$return .= ''; // Fix bi-directional text display defect in RTL languages.
$return .= '' . __('Edit') . "\n";
$return .= '' . $post_name . "\n";
- if ( isset($view_post) )
- $return .= "$view_post\n";
-
$return = apply_filters('get_sample_permalink_html', $return, $id, $new_title, $new_slug);
return $return;
diff --git wp-admin/js/post.dev.js wp-admin/js/post.dev.js
index 51bee06..6cb26be 100644
--- wp-admin/js/post.dev.js
+++ wp-admin/js/post.dev.js
@@ -1,4 +1,4 @@
-var tagBox, commentsBox, editPermalink, makeSlugeditClickable, WPSetThumbnailHTML, WPSetThumbnailID, WPRemoveThumbnail, wptitlehint;
+var tagBox, commentsBox, editPermalink, WPSetThumbnailHTML, WPSetThumbnailID, WPRemoveThumbnail, wptitlehint;
// return an array with any duplicate, whitespace or values removed
function array_unique_noempty(a) {
@@ -591,13 +591,6 @@ jQuery(document).ready( function($) {
real_slug.val(this.value);
}).focus();
}
-
- makeSlugeditClickable = function() {
- $('#editable-post-name').click(function() {
- $('#edit-slug-buttons').children('.edit-slug').click();
- });
- }
- makeSlugeditClickable();
}
// word count