Changeset 14399

Timestamp:

05/03/2010 08:10:26 PM (16 years ago)

Author:

nacin

Message:

Handle page hierarchy when showing the sample permalink. props duck_, fixes #12327.

Location:

trunk

Files:

• wp-admin/includes/post.php (modified) (1 diff)
• wp-includes/post.php (modified) (1 diff)

trunk/wp-admin/includes/post.php

@@ -1037 +1037 @@
     // Handle page hierarchy
     if ( $ptype->hierarchical ) {
-        $uri = get_page_uri($post->ID);
+        $uri = get_page_uri($post);
         $uri = untrailingslashit($uri);
         $uri = strrev( stristr( strrev( $uri ), '/' ) );

trunk/wp-includes/post.php

@@ -2909 +2909 @@
  * @since 1.5.0
  *
- * @param int $page_id Page ID.
+ * @param mixed $page Page object or page ID.
  * @return string Page URI.
  */
-function get_page_uri($page_id) {
-    $page = get_page($page_id);
+function get_page_uri($page) {
+    if ( ! is_object($page) )
+        $page = get_page($page);
     $uri = $page->post_name;