WordPress-C/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2025-02-17 03:56:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed some issues with permalinks when WP is installed in a subdirectory.

Browse Source 
git-svn-id: http://svn.automattic.com/wordpress/trunk@499 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
emc3 2003-10-30 14:55:35 +00:00
parent 797d9518b1
commit 03437ba399
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
b2-include/b2template.functions.php
View File

@ -1188,9 +1188,9 @@ function comments_popup_link($zero='No Comments', $one='1 Comment', $more='% Com
return; return;
} }
} }
echo '<a href="' . $siteurl; echo '<a href="';
if ($b2commentsjavascript) { if ($b2commentsjavascript) {
echo $b2commentspopupfile.$querystring_start.'p'.$querystring_equal.$id.$querystring_separator.'c'.$querystring_equal.'1'; echo get_permalink();
echo '" onclick="b2open(this.href); return false"'; echo '" onclick="b2open(this.href); return false"';
} else { } else {
// if comments_popup_script() is not in the template, display simple comment link // if comments_popup_script() is not in the template, display simple comment link
@ -1407,7 +1407,8 @@ function trackback_rdf($timezone = 0) {
/***** Permalink tags *****/ /***** Permalink tags *****/
function get_permalink($id=false) { function get_permalink($id=false) {
global $post, $wpdb, $tableposts; global $post, $wpdb, $tableposts, $siteurl;
global $querystring_start, $querystring_equal;
$rewritecode = array( $rewritecode = array(
'%year%', '%year%',
'%monthnum%', '%monthnum%',
@ -1423,9 +1424,9 @@ function get_permalink($id=false) {
date('j', $unixtime), date('j', $unixtime),
$post->post_name $post->post_name
); );
return str_replace($rewritecode, $rewritereplace, get_settings('permalink_structure')); return $siteurl . str_replace($rewritecode, $rewritereplace, get_settings('permalink_structure'));
} else { // if they're not using the fancy permalink option } else { // if they're not using the fancy permalink option
return $file.$querystring_start.'p'.$querystring_equal.$post->ID; return $siteurl . $file.$querystring_start.'p'.$querystring_equal.$post->ID;
} }
} else { // if an ID is given } else { // if an ID is given
$idpost = $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");
@ -1437,9 +1438,9 @@ function get_permalink($id=false) {
date('j', $unixtime), date('j', $unixtime),
$idpost->post_name $idpost->post_name
); );
return str_replace($rewritecode, $rewritereplace, get_settings('permalink_structure')); return $siteurl . str_replace($rewritecode, $rewritereplace, get_settings('permalink_structure'));
} else { } else {
return $file.$querystring_start.'p'.$querystring_equal.$idpost->ID; return $siteurl . $file.$querystring_start.'p'.$querystring_equal.$idpost->ID;
} }
} }
} }