<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[14124] trunk: Display the correct Slug in the permalink preview.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/14124">14124</a></dd>
<dt>Author</dt> <dd>dd32</dd>
<dt>Date</dt> <dd>2010-04-18 01:46:28 +0000 (Sun, 18 Apr 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Display the correct Slug in the permalink preview. Props duck_. Fixes <a href="http://trac.wordpress.org/ticket/12870">#12870</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminadminajaxphp">trunk/wp-admin/admin-ajax.php</a></li>
<li><a href="#trunkwpadminincludespostphp">trunk/wp-admin/includes/post.php</a></li>
<li><a href="#trunkwpincludeslinktemplatephp">trunk/wp-includes/link-template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminadminajaxphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/admin-ajax.php (14123 => 14124)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/admin-ajax.php 2010-04-17 12:27:13 UTC (rev 14123)
+++ trunk/wp-admin/admin-ajax.php 2010-04-18 01:46:28 UTC (rev 14124)
</span><span class="lines">@@ -1058,7 +1058,7 @@
</span><span class="cx"> check_ajax_referer( 'samplepermalink', 'samplepermalinknonce' );
</span><span class="cx"> $post_id = isset($_POST['post_id'])? intval($_POST['post_id']) : 0;
</span><span class="cx"> $title = isset($_POST['new_title'])? $_POST['new_title'] : '';
</span><del>- $slug = isset($_POST['new_slug'])? $_POST['new_slug'] : '';
</del><ins>+ $slug = isset($_POST['new_slug'])? $_POST['new_slug'] : null;
</ins><span class="cx"> die(get_sample_permalink_html($post_id, $title, $slug));
</span><span class="cx"> break;
</span><span class="cx"> case 'inline-save':
</span></span></pre></div>
<a id="trunkwpadminincludespostphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/post.php (14123 => 14124)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/post.php 2010-04-17 12:27:13 UTC (rev 14123)
+++ trunk/wp-admin/includes/post.php 2010-04-18 01:46:28 UTC (rev 14124)
</span><span class="lines">@@ -1027,13 +1027,13 @@
</span><span class="cx"> $post->post_name = sanitize_title($post->post_name ? $post->post_name : $post->post_title, $post->ID);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $post->post_name = wp_unique_post_slug($post->post_name, $post->ID, $post->post_status, $post->post_type, $post->post_parent);
-
</del><span class="cx"> // If the user wants to set a new name -- override the current one
</span><span class="cx"> // Note: if empty name is supplied -- use the title instead, see #6072
</span><span class="cx"> if ( !is_null($name) )
</span><span class="cx"> $post->post_name = sanitize_title($name ? $name : $title, $post->ID);
</span><span class="cx">
</span><ins>+ $post->post_name = wp_unique_post_slug($post->post_name, $post->ID, $post->post_status, $post->post_type, $post->post_parent);
+
</ins><span class="cx"> $post->filter = 'sample';
</span><span class="cx">
</span><span class="cx"> $permalink = get_permalink($post, true);
</span></span></pre></div>
<a id="trunkwpincludeslinktemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/link-template.php (14123 => 14124)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/link-template.php 2010-04-17 12:27:13 UTC (rev 14123)
+++ trunk/wp-includes/link-template.php 2010-04-18 01:46:28 UTC (rev 14124)
</span><span class="lines">@@ -271,11 +271,11 @@
</span><span class="cx"> else
</span><span class="cx"> $post = &get_post($id);
</span><span class="cx">
</span><del>- $pagestruct = $wp_rewrite->get_page_permastruct();
</del><ins>+ $link = $wp_rewrite->get_page_permastruct();
</ins><span class="cx">
</span><del>- if ( '' != $pagestruct && ( ( isset($post->post_status) && 'draft' != $post->post_status && 'pending' != $post->post_status ) || $sample ) ) {
- $link = get_page_uri($id);
- $link = ( $leavename ) ? $pagestruct : str_replace('%pagename%', $link, $pagestruct);
</del><ins>+ if ( '' != $link && ( ( isset($post->post_status) && 'draft' != $post->post_status && 'pending' != $post->post_status ) || $sample ) ) {
+ if ( ! $leavename )
+ $link = str_replace('%pagename%', get_page_uri($id), $link);
</ins><span class="cx"> $link = home_url($link);
</span><span class="cx"> $link = user_trailingslashit($link, 'page');
</span><span class="cx"> } else {
</span></span></pre>
</div>
</div>
</body>
</html>