Index: src/wp-admin/edit-form-advanced.php
===================================================================
--- src/wp-admin/edit-form-advanced.php	(revision 35460)
+++ src/wp-admin/edit-form-advanced.php	(working copy)
@@ -304,9 +304,6 @@
 	}
 }
 
-if ( ! ( 'pending' == get_post_status( $post ) && ! current_user_can( $post_type_object->cap->publish_posts ) ) )
-	add_meta_box('slugdiv', __('Slug'), 'post_slug_meta_box', null, 'normal', 'core');
-
 if ( post_type_supports($post_type, 'author') ) {
 	if ( is_super_admin() || current_user_can( $post_type_object->cap->edit_others_posts ) )
 		add_meta_box('authordiv', __('Author'), 'post_author_meta_box', null, 'normal', 'core');
@@ -567,30 +564,36 @@
 ?>
 <div class="inside">
 <?php
-if ( $viewable ) :
-$sample_permalink_html = $post_type_object->public ? get_sample_permalink_html($post->ID) : '';
+if ( $viewable ) {
+	$sample_permalink_html = $post_type_object->public ? get_sample_permalink_html($post->ID) : '';
 
-// As of 4.4, the Get Shortlink button is hidden by default.
-if ( has_filter( 'pre_get_shortlink' ) || has_filter( 'get_shortlink' ) ) {
-	$shortlink = wp_get_shortlink($post->ID, 'post');
+	// As of 4.4, the Get Shortlink button is hidden by default.
+	if ( has_filter( 'pre_get_shortlink' ) || has_filter( 'get_shortlink' ) ) {
+		$shortlink = wp_get_shortlink($post->ID, 'post');
 
-	if ( !empty( $shortlink ) && $shortlink !== $permalink && $permalink !== home_url('?page_id=' . $post->ID) ) {
-    	$sample_permalink_html .= '<input id="shortlink" type="hidden" value="' . esc_attr($shortlink) . '" /><a href="#" class="button button-small" onclick="prompt(&#39;URL:&#39;, jQuery(\'#shortlink\').val()); return false;">' . __('Get Shortlink') . '</a>';
+		if ( !empty( $shortlink ) && $shortlink !== $permalink && $permalink !== home_url('?page_id=' . $post->ID) ) {
+	    	$sample_permalink_html .= '<input id="shortlink" type="hidden" value="' . esc_attr($shortlink) . '" /><a href="#" class="button button-small" onclick="prompt(&#39;URL:&#39;, jQuery(\'#shortlink\').val()); return false;">' . __('Get Shortlink') . '</a>';
+		}
 	}
-}
 
-if ( $post_type_object->public && ! ( 'pending' == get_post_status( $post ) && !current_user_can( $post_type_object->cap->publish_posts ) ) ) {
-	$has_sample_permalink = $sample_permalink_html && 'auto-draft' != $post->post_status;
-?>
-	<div id="edit-slug-box" class="hide-if-no-js">
+	if ( $post_type_object->public && ! ( 'pending' == get_post_status( $post ) && !current_user_can( $post_type_object->cap->publish_posts ) ) ) {
+		$has_sample_permalink = $sample_permalink_html && 'auto-draft' != $post->post_status;
+	?>
+		<div id="edit-slug-box" class="hide-if-no-js">
+		<?php
+			if ( $has_sample_permalink )
+				echo $sample_permalink_html;
+		?>
+		</div>
 	<?php
-		if ( $has_sample_permalink )
-			echo $sample_permalink_html;
+	}
+} elseif( ! ( 'pending' == get_post_status( $post ) && ! current_user_can( $post_type_object->cap->publish_posts ) ) ) {
+	$editable_slug = apply_filters( 'editable_slug', $post->post_name, $post );
 	?>
-	</div>
-<?php
+	<label for="post_name"><?php _e( 'Slug:' ) ?></label>
+	<input name="post_name" type="text" id="post_name" value="<?php echo esc_attr( $editable_slug ); ?>" />
+	<?php
 }
-endif;
 ?>
 </div>
 <?php