<!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>[13865] trunk: Fix the Permalink editor for custom post_types.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13865">13865</a></dd>
<dt>Author</dt> <dd>dd32</dd>
<dt>Date</dt> <dd>2010-03-28 05:23:49 +0000 (Sun, 28 Mar 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix the Permalink editor for custom post_types. Fixes <a href="http://trac.wordpress.org/ticket/12742">#12742</a> </pre>
<h3>Modified Paths</h3>
<ul>
<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="trunkwpadminincludespostphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/post.php (13864 => 13865)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/post.php 2010-03-28 04:48:20 UTC (rev 13864)
+++ trunk/wp-admin/includes/post.php 2010-03-28 05:23:49 UTC (rev 13865)
</span><span class="lines">@@ -1011,9 +1011,11 @@
</span><span class="cx"> */
</span><span class="cx"> function get_sample_permalink($id, $title = null, $name = null) {
</span><span class="cx"> $post = &get_post($id);
</span><del>- if ( !$post->ID ) {
</del><ins>+ if ( !$post->ID )
</ins><span class="cx"> return array('', '');
</span><del>- }
</del><ins>+
+ $ptype = get_post_type_object($post->post_type);
+
</ins><span class="cx"> $original_status = $post->post_status;
</span><span class="cx"> $original_date = $post->post_date;
</span><span class="cx"> $original_name = $post->post_name;
</span><span class="lines">@@ -1029,22 +1031,24 @@
</span><span class="cx">
</span><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><del>- if ( !is_null($name) ) {
</del><ins>+ if ( !is_null($name) )
</ins><span class="cx"> $post->post_name = sanitize_title($name ? $name : $title, $post->ID);
</span><del>- }
</del><span class="cx">
</span><span class="cx"> $post->filter = 'sample';
</span><span class="cx">
</span><span class="cx"> $permalink = get_permalink($post, true);
</span><span class="cx">
</span><ins>+ if ( $ptype->query_var ) // Replace custom post_type Token with generic pagename token for ease of use.
+ $permalink = str_replace('%' . $ptype->query_var . '%', '%pagename%', $permalink);
+
</ins><span class="cx"> // Handle page hierarchy
</span><del>- if ( 'page' == $post->post_type ) {
</del><ins>+ if ( $ptype->hierarchical ) {
</ins><span class="cx"> $uri = get_page_uri($post->ID);
</span><span class="cx"> $uri = untrailingslashit($uri);
</span><span class="cx"> $uri = strrev( stristr( strrev( $uri ), '/' ) );
</span><span class="cx"> $uri = untrailingslashit($uri);
</span><span class="cx"> if ( !empty($uri) )
</span><del>- $uri .='/';
</del><ins>+ $uri .= '/';
</ins><span class="cx"> $permalink = str_replace('%pagename%', "${uri}%pagename%", $permalink);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1074,7 +1078,14 @@
</span><span class="cx"> list($permalink, $post_name) = get_sample_permalink($post->ID, $new_title, $new_slug);
</span><span class="cx">
</span><span class="cx"> if ( 'publish' == $post->post_status ) {
</span><del>- $view_post = 'post' == $post->post_type ? __('View Post') : __('View Page');
</del><ins>+ if ( 'post' == $post->post_type ) {
+ $view_post = __('View Post');
+ } elseif ( 'page' == $post->post_type ) {
+ $view_post = __('View Page');
+ } else {
+ $ptype = get_post_type_object($post->post_type);
+ $view_post = sprintf(__('View %s'), $ptype->singular_label);
+ }
</ins><span class="cx"> $title = __('Click to edit this part of the permalink');
</span><span class="cx"> } else {
</span><span class="cx"> $title = __('Temporary permalink. Click to edit this part.');
</span></span></pre></div>
<a id="trunkwpincludeslinktemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/link-template.php (13864 => 13865)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/link-template.php 2010-03-28 04:48:20 UTC (rev 13864)
+++ trunk/wp-includes/link-template.php 2010-03-28 05:23:49 UTC (rev 13865)
</span><span class="lines">@@ -108,7 +108,7 @@
</span><span class="cx"> elseif ( $post->post_type == 'attachment' )
</span><span class="cx"> return get_attachment_link($post->ID);
</span><span class="cx"> elseif ( in_array($post->post_type, get_post_types( array('_builtin' => false) ) ) )
</span><del>- return get_post_permalink($post);
</del><ins>+ return get_post_permalink($post, $leavename);
</ins><span class="cx">
</span><span class="cx"> $permalink = get_option('permalink_structure');
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>