Index: /trunk/wp-content/themes/default/attachment.php
===================================================================
--- /trunk/wp-content/themes/default/attachment.php (revision 5981)
+++ /trunk/wp-content/themes/default/attachment.php (revision 5982)
@@ -33,9 +33,9 @@
comment_status) && ('open' == $post->ping_status)) {
// Both Comments and Pings are open ?>
- You can leave a response, or trackback from your own site.
+ You can leave a response, or trackback from your own site.
comment_status) && ('open' == $post->ping_status)) {
// Only Pings are Open ?>
- Responses are currently closed, but you can trackback from your own site.
+ Responses are currently closed, but you can trackback from your own site.
comment_status) && !('open' == $post->ping_status)) {
Index: /trunk/wp-content/themes/default/single.php
===================================================================
--- /trunk/wp-content/themes/default/single.php (revision 5981)
+++ /trunk/wp-content/themes/default/single.php (revision 5982)
@@ -32,9 +32,9 @@
comment_status) && ('open' == $post->ping_status)) {
// Both Comments and Pings are open ?>
- You can leave a response, or trackback from your own site.
+ You can leave a response, or trackback from your own site.
comment_status) && ('open' == $post->ping_status)) {
// Only Pings are Open ?>
- Responses are currently closed, but you can trackback from your own site.
+ Responses are currently closed, but you can trackback from your own site.
comment_status) && !('open' == $post->ping_status)) {
Index: /trunk/wp-includes/comment-template.php
===================================================================
--- /trunk/wp-includes/comment-template.php (revision 5981)
+++ /trunk/wp-includes/comment-template.php (revision 5982)
@@ -224,16 +224,15 @@
function get_trackback_url() {
global $id;
- $tb_url = get_option('siteurl') . '/wp-trackback.php?p=' . $id;
-
- if ( '' != get_option('permalink_structure') )
+ if ( '' != get_option('permalink_structure') ) {
$tb_url = trailingslashit(get_permalink()) . user_trailingslashit('trackback', 'single_trackback');
-
+ } else {
+ $tb_url = get_option('siteurl') . '/wp-trackback.php?p=' . $id;
+ }
return apply_filters('trackback_url', $tb_url);
}
-function trackback_url( $display = true ) {
- if ( $display)
- echo get_trackback_url();
- else
- return get_trackback_url();
+
+function trackback_url($deprecated = true) { // remove backwards compat in 2.4
+ if ($deprecated) echo get_trackback_url();
+ else return get_trackback_url();
}
@@ -251,5 +250,5 @@
echo '"'."\n";
echo ' dc:title="'.str_replace('--', '--', wptexturize(strip_tags(get_the_title()))).'"'."\n";
- echo ' trackback:ping="'.trackback_url(0).'"'." />\n";
+ echo ' trackback:ping="'.get_trackback_url().'"'." />\n";
echo '';
}