Ticket #4800: trackback-cleanup.diff

wp-content/themes/default/attachment.php

@@ -32 +32 @@
 
                                                 <?php if (('open' == $post-> comment_status) && ('open' == $post->ping_status)) {
                                                         // Both Comments and Pings are open ?>
-                                                        You can <a href="#respond">leave a response</a>, or <a href="<?php trackback_url(true); ?>" rel="trackback">trackback</a> from your own site.
+                                                        You can <a href="#respond">leave a response</a>, or <a href="<?php trackback_url(); ?>" rel="trackback">trackback</a> from your own site.
 
                                                 <?php } elseif (!('open' == $post-> comment_status) && ('open' == $post->ping_status)) {
                                                         // Only Pings are Open ?>
-                                                        Responses are currently closed, but you can <a href="<?php trackback_url(true); ?> " rel="trackback">trackback</a> from your own site.
+                                                        Responses are currently closed, but you can <a href="<?php trackback_url(); ?> " rel="trackback">trackback</a> from your own site.
 
                                                 <?php } elseif (('open' == $post-> comment_status) && !('open' == $post->ping_status)) {
                                                         // Comments are open, Pings are not ?>

wp-content/themes/default/single.php

@@ -31 +31 @@
 
                                                 <?php if (('open' == $post-> comment_status) && ('open' == $post->ping_status)) {
                                                         // Both Comments and Pings are open ?>
-                                                        You can <a href="#respond">leave a response</a>, or <a href="<?php trackback_url(true); ?>" rel="trackback">trackback</a> from your own site.
+                                                        You can <a href="#respond">leave a response</a>, or <a href="<?php trackback_url(); ?>" rel="trackback">trackback</a> from your own site.
 
                                                 <?php } elseif (!('open' == $post-> comment_status) && ('open' == $post->ping_status)) {
                                                         // Only Pings are Open ?>
-                                                        Responses are currently closed, but you can <a href="<?php trackback_url(true); ?> " rel="trackback">trackback</a> from your own site.
+                                                        Responses are currently closed, but you can <a href="<?php trackback_url(); ?> " rel="trackback">trackback</a> from your own site.
 
                                                 <?php } elseif (('open' == $post-> comment_status) && !('open' == $post->ping_status)) {
                                                         // Comments are open, Pings are not ?>

wp-includes/comment-template.php

@@ -223 +223 @@
 
 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();
 }
 
 function trackback_rdf($timezone = 0) {
@@ -250 +249 @@
                 the_permalink();
                 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 '</rdf:RDF>';
         }
 }