Changeset 659

Timestamp:

12/28/2003 09:45:18 PM (22 years ago)

Author:

saxmatt

Message:

Permalink structure fix and link comments when pings are on.

File:

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

trunk/wp-includes/template-functions.php

@@ -517 +517 @@
         $monthlink = str_replace('%year%', $year, $monthlink);
         $monthlink = str_replace('%monthnum%', intval($month), $monthlink);
-        return $monthlink;
+        return $siteurl . $monthlink;
     } else {
         return $siteurl.'/'.$blogfilename.$querystring_start.'m'.$querystring_equal.$year.zeroise($month, 2);
@@ -536 +536 @@
         $daylink = str_replace('%monthnum%', intval($month), $daylink);
         $daylink = str_replace('%day%', intval($day), $daylink);
-        return $daylink;
+        return $siteurl . $daylink;
     } else {
         return $siteurl.'/'.$blogfilename.$querystring_start.'m'.$querystring_equal.$year.zeroise($month, 2).zeroise($day, 2);
@@ -1308 +1308 @@
         // Get any static stuff from the front
         $front = substr($permalink_structure, 0, strpos($permalink_structure, '%'));
-        $link = $front . 'category/' . $category_nicename;
+        $link = $siteurl . $front . 'category/' . $category_nicename;
     }
 
@@ -1550 +1550 @@
     global $querystring_start, $querystring_equal, $querystring_separator, $siteurl;
     $number = $wpdb->get_var("SELECT COUNT(*) FROM $tablecomments WHERE comment_post_ID = $id AND comment_approved = '1'");
-    if (0 == $number && 'closed' == $post->comment_status) {
+    if (0 == $number && 'closed' == $post->comment_status && 'closed' == $post->ping_status) {
         echo $none;
         return;