Changeset 7139

Timestamp:

03/03/2008 09:02:53 PM (17 years ago)

Author:

ryan

Message:

Slug edit fix from nbachiyski. fixes #6072

Location:

trunk/wp-admin

Files:

• admin-ajax.php (modified) (1 diff)
• includes/post.php (modified) (3 diffs)
• js/slug.js (modified) (1 diff)

trunk/wp-admin/admin-ajax.php

@@ -574 +574 @@
     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_slug']));
+    die(get_sample_permalink_html($post_id, $_POST['new_title'], $_POST['new_slug']));
 break;
 default :

trunk/wp-admin/includes/post.php

@@ -578 +578 @@
 }
 
-function get_sample_permalink($id, $name = null) {
+function get_sample_permalink($id, $title, $name = null) {
     $post = &get_post($id);
     if (!$post->ID) {
@@ -586 +586 @@
     $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);
+
     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 (!is_null($name)) {
-        $post->post_name = sanitize_title($name, $post->ID);
+        $post->post_name = sanitize_title($name? $name : $post->post_title, $post->ID);
     }
 
@@ -611 +615 @@
     $post->post_date = $original_date;
     $post->post_name = $original_name;
+    $post->post_title = $original_title;
     return $permalink;
 }
 
-function get_sample_permalink_html($id, $new_slug=null) {
+function get_sample_permalink_html($id, $new_title=null, $new_slug=null) {
     $post = &get_post($id);
-    list($permalink, $post_name) = get_sample_permalink($post->ID, $new_slug);
+    list($permalink, $post_name) = get_sample_permalink($post->ID, $new_title, $new_slug);
     if (false === strpos($permalink, '%postname%') && false === strpos($permalink, '%pagename%')) {
         return '';

trunk/wp-admin/js/slug.js

@@ -11 +11 @@
     b.html('<a href="" class="save">'+slugL10n.save+'</a> <a class="cancel" href="">'+slugL10n.cancel+'</a>');
     b.children('.save').click(function() {
-        var new_slug = e.children('input').attr('value');
+        var new_slug = e.children('input').val();
         jQuery.post(slugL10n.requestFile, {
             action: 'sample-permalink',
             post_id: post_id,
             new_slug: new_slug,
+            new_title: jQuery('#title').val(),
             samplepermalinknonce: jQuery('#samplepermalinknonce').val()}, function(data) {
                 jQuery('#edit-slug-box').html(data);