Changeset 836 for trunk/wp-includes/template-functions-general.php

Timestamp:

02/05/2004 08:55:50 PM (22 years ago)

Author:

rboren

Message:

Clean feed and trackback URLs.

File:

• trunk/wp-includes/template-functions-general.php (modified) (2 diffs)

trunk/wp-includes/template-functions-general.php

@@ -24 +24 @@
 function get_bloginfo($show='') {
     global $siteurl, $blogfilename, $blogname, $blogdescription, $siteurl, $admin_email;
+
+    $do_perma = 0;
+    $feed_url = $siteurl;
+    $comment_feed_url = $siteurl;
+
+    if ('' != get_settings('permalink_structure')) {
+        $do_perma = 1;
+        $feed_url = $siteurl . '/feed';
+        $comment_feed_url = $siteurl . '/comments/feed';
+    }
+
     switch($show) {
         case "url":
@@ -33 +44 @@
         case "rdf_url":
             $output = $siteurl.'/wp-rdf.php';
+            if ($do_perma) {
+                $output = $feed_url . '/rdf/';
+            }
             break;
         case "rss_url":
             $output = $siteurl.'/wp-rss.php';
+            if ($do_perma) {
+                $output = $feed_url . '/rss/';
+            }
             break;
         case "rss2_url":
             $output = $siteurl.'/wp-rss2.php';
+            if ($do_perma) {
+                $output = $feed_url . '/rss2/';
+            }
             break;
         case "atom_url":
             $output = $siteurl.'/wp-atom.php';
+            if ($do_perma) {
+                $output = $feed_url . '/atom/';
+            }
             break;        
         case "comments_rss2_url":
             $output = $siteurl.'/wp-commentsrss2.php';
+            if ($do_perma) {
+                $output = $comment_feed_url . '/rss2/';
+            }
             break;
         case "pingback_url":