mirror of
https://github.com/WordPress/WordPress.git
synced 2024-11-09 04:11:10 +01:00
Permalink related bugfixes.
git-svn-id: http://svn.automattic.com/wordpress/trunk@492 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
parent
c8db4426b9
commit
ca18240a96
@ -777,10 +777,10 @@ function link_pages($before='<br />', $after='<br />', $next_or_number='number',
|
|||||||
|
|
||||||
function previous_post($format='%', $previous='previous post: ', $title='yes', $in_same_cat='no', $limitprev=1, $excluded_categories='') {
|
function previous_post($format='%', $previous='previous post: ', $title='yes', $in_same_cat='no', $limitprev=1, $excluded_categories='') {
|
||||||
global $tableposts, $id, $post, $siteurl, $blogfilename, $querycount, $wpdb;
|
global $tableposts, $id, $post, $siteurl, $blogfilename, $querycount, $wpdb;
|
||||||
global $p, $posts, $posts_per_page, $s;
|
global $p, $posts, $posts_per_page, $s, $single;
|
||||||
global $querystring_start, $querystring_equal, $querystring_separator;
|
global $querystring_start, $querystring_equal, $querystring_separator;
|
||||||
|
|
||||||
if(($p) || ($posts_per_page==1)) {
|
if(($p) || ($posts_per_page == 1) || 1 == $single) {
|
||||||
|
|
||||||
$current_post_date = $post->post_date;
|
$current_post_date = $post->post_date;
|
||||||
$current_category = $post->post_category;
|
$current_category = $post->post_category;
|
||||||
@ -816,9 +816,9 @@ function previous_post($format='%', $previous='previous post: ', $title='yes', $
|
|||||||
|
|
||||||
function next_post($format='%', $next='next post: ', $title='yes', $in_same_cat='no', $limitnext=1, $excluded_categories='') {
|
function next_post($format='%', $next='next post: ', $title='yes', $in_same_cat='no', $limitnext=1, $excluded_categories='') {
|
||||||
global $tableposts, $p, $posts, $id, $post, $siteurl, $blogfilename, $querycount, $wpdb;
|
global $tableposts, $p, $posts, $id, $post, $siteurl, $blogfilename, $querycount, $wpdb;
|
||||||
global $time_difference;
|
global $time_difference, $single;
|
||||||
global $querystring_start, $querystring_equal, $querystring_separator;
|
global $querystring_start, $querystring_equal, $querystring_separator;
|
||||||
if(($p) || ($posts==1)) {
|
if(($p) || ($posts==1) || 1 == $single) {
|
||||||
|
|
||||||
$current_post_date = $post->post_date;
|
$current_post_date = $post->post_date;
|
||||||
$current_category = $post->post_category;
|
$current_category = $post->post_category;
|
||||||
@ -1428,18 +1428,18 @@ function get_permalink($id=false) {
|
|||||||
return $file.$querystring_start.'p'.$querystring_equal.$post->ID;
|
return $file.$querystring_start.'p'.$querystring_equal.$post->ID;
|
||||||
}
|
}
|
||||||
} else { // if an ID is given
|
} else { // if an ID is given
|
||||||
$post = $wpdb->get_row("SELECT post_date, post_name FROM $tableposts WHERE ID = $id");
|
$idpost = $wpdb->get_row("SELECT post_date, post_name FROM $tableposts WHERE ID = $id");
|
||||||
if ('' != get_settings('permalink_structure')) {
|
if ('' != get_settings('permalink_structure')) {
|
||||||
$unixtime = strtotime($post->post_date);
|
$unixtime = strtotime($idpost->post_date);
|
||||||
$rewritereplace = array(
|
$rewritereplace = array(
|
||||||
date('Y', $unixtime),
|
date('Y', $unixtime),
|
||||||
date('n', $unixtime),
|
date('n', $unixtime),
|
||||||
date('j', $unixtime),
|
date('j', $unixtime),
|
||||||
$post->post_name
|
$idpost->post_name
|
||||||
);
|
);
|
||||||
return str_replace($rewritecode, $rewritereplace, get_settings('permalink_structure'));
|
return str_replace($rewritecode, $rewritereplace, get_settings('permalink_structure'));
|
||||||
} else {
|
} else {
|
||||||
return $file.$querystring_start.'p'.$querystring_equal.$post->ID;
|
return $file.$querystring_start.'p'.$querystring_equal.$idpost->ID;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user