Changeset 4475

Timestamp:

11/17/2006 08:00:11 PM (18 years ago)

Author:

ryan

Message:

Fix attachment links for page on front. Props mdawaffe. fixes #2515

File:

• trunk/wp-includes/link-template.php (modified) (3 diffs)

trunk/wp-includes/link-template.php

@@ -90 +90 @@
 }
 
+// Respects page_on_front.  Use this one.
 function get_page_link($id = false) {
+    global $post;
+
+    if ( !$id )
+        $id = $post->ID;
+
+    if ( 'page' == get_option('show_on_front') && $id == get_option('page_on_front') )
+        $link = get_option('home');
+    else
+        $link = _get_page_link( $id );
+
+    return apply_filters('page_link', $link, $id);
+}
+
+// Ignores page_on_front.  Internal use only.
+function _get_page_link( $id = false ) {
     global $post, $wp_rewrite;
 
@@ -106 +122 @@
     }
 
-    if ( 'page' == get_option('show_on_front') && $id == get_option('page_on_front') )
-        $link = get_option('home');
-
-    return apply_filters('page_link', $link, $id);
+    return apply_filters( '_get_page_link', $link, $id );
 }
 
@@ -124 +137 @@
     if ( $wp_rewrite->using_permalinks() && ($object->post_parent > 0) ) {
         $parent = get_post($object->post_parent);
-        $parentlink = get_permalink($object->post_parent);
+        if ( 'page' == $parent->post_type )
+            $parentlink = _get_page_link( $object->post_parent ); // Ignores page_on_front
+        else
+            $parentlink = get_permalink( $object->post_parent );
         if (! strstr($parentlink, '?') )
             $link = trim($parentlink, '/') . '/' . $object->post_name . '/';