Changeset 13865

Timestamp:

03/28/2010 05:23:49 AM (13 years ago)

Author:

dd32

Message:

Fix the Permalink editor for custom post_types. Fixes #12742

Location:

trunk

Files:

• wp-admin/includes/post.php (modified) (5 diffs)
• wp-includes/link-template.php (modified) (1 diff)

trunk/wp-admin/includes/post.php

@@ -1012 +1012 @@
 function get_sample_permalink($id, $title = null, $name = null) {
     $post = &get_post($id);
-    if ( !$post->ID ) {
+    if ( !$post->ID )
         return array('', '');
-    }
+
+    $ptype = get_post_type_object($post->post_type);
+
     $original_status = $post->post_status;
     $original_date = $post->post_date;
@@ -1030 +1032 @@
     // 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) ) {
+    if ( !is_null($name) )
         $post->post_name = sanitize_title($name ? $name : $title, $post->ID);
-    }
 
     $post->filter = 'sample';
@@ -1038 +1039 @@
     $permalink = get_permalink($post, true);
 
+    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);
+
     // Handle page hierarchy
-    if ( 'page' == $post->post_type ) {
+    if ( $ptype->hierarchical ) {
         $uri = get_page_uri($post->ID);
         $uri = untrailingslashit($uri);
@@ -1045 +1049 @@
         $uri = untrailingslashit($uri);
         if ( !empty($uri) )
-            $uri .='/';
+            $uri .= '/';
         $permalink = str_replace('%pagename%', "${uri}%pagename%", $permalink);
     }
@@ -1075 +1079 @@
 
     if ( 'publish' == $post->post_status ) {
-        $view_post = 'post' == $post->post_type ? __('View Post') : __('View Page');
+        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);
+        }
         $title = __('Click to edit this part of the permalink');
     } else {

trunk/wp-includes/link-template.php

@@ -109 +109 @@
         return get_attachment_link($post->ID);
     elseif ( in_array($post->post_type, get_post_types( array('_builtin' => false) ) ) )
-        return get_post_permalink($post);
+        return get_post_permalink($post, $leavename);
 
     $permalink = get_option('permalink_structure');