Upstream
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

git-svn-id: http://svn.automattic.com/wordpress/trunk@4475 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2006-11-17 20:00:11 +00:00
parent 448bd4fb7b
commit fd46e4b1f6
1 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
wp-includes/link-template.php
View File

@ -89,7 +89,23 @@ function post_permalink($post_id = 0, $mode = '') { // $mode legacy
return get_permalink($post_id);
}
// 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;
if ( !$id )
@ -105,10 +121,7 @@ function get_page_link($id = false) {
$link = get_option('home') . "/?page_id=$id";
}
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 );
}
function get_attachment_link($id = false) {
@ -123,7 +136,10 @@ function get_attachment_link($id = false) {
$object = get_post($id);
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 . '/';
}