Changeset 7162

Timestamp:

03/05/2008 10:09:28 PM (18 years ago)

Author:

markjaquith

Message:

Post slug fixes from nbachiyski. fixes #6072

Location:

trunk

Files:

• wp-admin/admin-ajax.php (modified) (1 diff)
• wp-admin/includes/post.php (modified) (2 diffs)
• wp-includes/js/autosave.js (modified) (1 diff)

trunk/wp-admin/admin-ajax.php

@@ -572 +572 @@
         check_ajax_referer( 'samplepermalink', 'samplepermalinknonce' );
         $post_id = isset($_POST['post_id'])? intval($_POST['post_id']) : 0;
-        die(get_sample_permalink_html($post_id, $_POST['new_title'], $_POST['new_slug']));
+        $title = isset($_POST['new_title'])? $_POST['new_title'] : '';
+        $slug = isset($_POST['new_slug'])? $_POST['new_slug'] : '';
+        die(get_sample_permalink_html($post_id, $title, $slug));
 break;
 default :

trunk/wp-admin/includes/post.php

@@ -582 +582 @@
 }
 
-function get_sample_permalink($id, $title, $name = null) {
+function get_sample_permalink($id, $title=null, $name = null) {
         $post = &get_post($id);
         if (!$post->ID) {
@@ -590 +590 @@
         $original_date = $post->post_date;
         $original_name = $post->post_name;
-        $original_title = $post->post_title;
-
-        $post->post_title = $title;
-        $post->post_name = sanitize_title($post->post_name? $post->post_name : $post->post_title, $post->ID);
-
+
+        // Hack: get_permalink would return ugly permalink for
+        // drafts, so we will fake, that our post is published
         if (in_array($post->post_status, array('draft', 'pending'))) {
                 $post->post_status = 'publish';
                 $post->post_date = date('Y-m-d H:i:s');
-        }
+                $post->post_name = sanitize_title($post->post_name? $post->post_name : $post->post_title, $post->ID); 
+        }
+
+        // If the user wants to set a new name -- override the current one
+        // Note: if empty name is supplied -- use the title instead, see #6072
         if (!is_null($name)) {
-                $post->post_name = sanitize_title($name? $name : $post->post_title, $post->ID);
+                $post->post_name = sanitize_title($name? $name : $title, $post->ID);
         }
 

trunk/wp-includes/js/autosave.js

@@ -93 +93 @@
                                 action: 'sample-permalink',
                                 post_id: post_id,
+                                new_title: jQuery('#title').val(), 
                                 samplepermalinknonce: jQuery('#samplepermalinknonce').val()
                         },