Edit permalink in place. Fixes #5679. Hat tip: nbachiyski.

git-svn-id: https://develop.svn.wordpress.org/trunk@6633 602fd350-edb4-49c9-b593-d223f7449a82

wp-includes/link-template.php

@@ -43,7 +43,7 @@ function permalink_anchor($mode = 'id') {
 }
 
 
-function get_permalink($id = 0) {
+function get_permalink($id = 0, $leavename=false) {
 	$rewritecode = array(
 		'%year%',
 		'%monthnum%',
@@ -51,11 +51,11 @@ function get_permalink($id = 0) {
 		'%hour%',
 		'%minute%',
 		'%second%',
-		'%postname%',
+		$leavename? '' : '%postname%',
 		'%post_id%',
 		'%category%',
 		'%author%',
-		'%pagename%'
+		$leavename? '' : '%pagename%',
 	);
 
 	$post = &get_post($id);

wp-includes/script-loader.php

@@ -114,6 +114,8 @@ class WP_Scripts {
 				'add' => attribute_escape(__('Add')),
 				'addTag' => attribute_escape(__('Add new tag')),
 				'separate' => __('Separate tags with commas'),
+				'save' => __('Save'),
+				'cancel' => __('Cancel'),
 				'requestFile' => get_option( 'siteurl' ) . '/wp-admin/admin-ajax.php',
 			) );
 			$this->add( 'media-upload', '/wp-admin/js/media-upload.js', false, '20080109' );