WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Slug edit fix from nbachiyski. fixes #6072 

git-svn-id: http://svn.automattic.com/wordpress/trunk@7139 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2008-03-03 21:02:53 +00:00
parent 5504c11b58
commit b1f0a853da
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-admin/admin-ajax.php
View File

@ -573,7 +573,7 @@ break;
case 'sample-permalink': case 'sample-permalink':
check_ajax_referer( 'samplepermalink', 'samplepermalinknonce' ); check_ajax_referer( 'samplepermalink', 'samplepermalinknonce' );
$post_id = isset($_POST['post_id'])? intval($_POST['post_id']) : 0; $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; break;
default : default :
do_action( 'wp_ajax_' . $_POST['action'] ); do_action( 'wp_ajax_' . $_POST['action'] );

15
wp-admin/includes/post.php
View File

@ -577,7 +577,7 @@ function postbox_classes( $id, $page ) {
} }
} }
function get_sample_permalink($id, $name = null) { function get_sample_permalink($id, $title, $name = null) {
$post = &get_post($id); $post = &get_post($id);
if (!$post->ID) { if (!$post->ID) {
return array('', ''); return array('', '');
@ -585,13 +585,17 @@ function get_sample_permalink($id, $name = null) {
$original_status = $post->post_status; $original_status = $post->post_status;
$original_date = $post->post_date; $original_date = $post->post_date;
$original_name = $post->post_name; $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'))) { if (in_array($post->post_status, array('draft', 'pending'))) {
$post->post_status = 'publish'; $post->post_status = 'publish';
$post->post_date = date('Y-m-d H:i:s'); $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)) { if (!is_null($name)) {
$post->post_name = sanitize_title($name, $post->ID); $post->post_name = sanitize_title($name? $name : $post->post_title, $post->ID);
} }
$permalink = get_permalink($post, true); $permalink = get_permalink($post, true);
@ -610,12 +614,13 @@ function get_sample_permalink($id, $name = null) {
$post->post_status = $original_status; $post->post_status = $original_status;
$post->post_date = $original_date; $post->post_date = $original_date;
$post->post_name = $original_name; $post->post_name = $original_name;
$post->post_title = $original_title;
return $permalink; 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); $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%')) { if (false === strpos($permalink, '%postname%') && false === strpos($permalink, '%pagename%')) {
return ''; return '';
} }

3
wp-admin/js/slug.js
View File

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