Changeset 2685

Timestamp:

07/02/2005 11:35:36 PM (20 years ago)

Author:

matt

Message:

Indentation and correct response link when no comments, fixes #1408

File:

• trunk/wp-includes/comment-functions.php (modified) (1 diff)

trunk/wp-includes/comment-functions.php

@@ -90 +90 @@
 
 function comments_popup_link($zero='No Comments', $one='1 Comment', $more='% Comments', $CSSclass='', $none='Comments Off') {
-    global $id, $wpcommentspopupfile, $wpcommentsjavascript, $post, $wpdb;
-    global $comment_count_cache;
-
+    global $id, $wpcommentspopupfile, $wpcommentsjavascript, $post, $wpdb;
+    global $comment_count_cache;
+    
     if (! is_single() && ! is_page()) {
-    if ( !isset($comment_count_cache[$id]))
-            $comment_count_cache[$id] = $wpdb->get_var("SELECT COUNT(comment_ID) FROM $wpdb->comments WHERE comment_post_ID = $id AND comment_approved = '1';");
-
-        $number = $comment_count_cache[$id];
-
-    if (0 == $number && 'closed' == $post->comment_status && 'closed' == $post->ping_status) {
-        echo $none;
-        return;
-    } else {
-        if (!empty($post->post_password)) { // if there's a password
-            if ($_COOKIE['wp-postpass_'.COOKIEHASH] != $post->post_password) {  // and it doesn't match the cookie
-                echo('Enter your password to view comments');
-                return;
-            }
-        }
-        echo '<a href="';
-        if ($wpcommentsjavascript) {
-                    if ( empty($wpcommentspopupfile) )
-                        $home = get_settings('home');
-                    else
-                        $home = get_settings('siteurl');
-                    echo $home . '/' . $wpcommentspopupfile.'?comments_popup='.$id;
-                    echo '" onclick="wpopen(this.href); return false"';
-        } else {
-            // if comments_popup_script() is not in the template, display simple comment link
-            comments_link();
-            echo '"';
-        }
-        if (!empty($CSSclass)) {
-            echo ' class="'.$CSSclass.'"';
-        }
-        echo '>';
-        comments_number($zero, $one, $more, $number);
-        echo '</a>';
-    }
+    if ( !isset($comment_count_cache[$id]) )
+        $comment_count_cache[$id] = $wpdb->get_var("SELECT COUNT(comment_ID) FROM $wpdb->comments WHERE comment_post_ID = $id AND comment_approved = '1';");
+    
+    $number = $comment_count_cache[$id];
+    
+    if (0 == $number && 'closed' == $post->comment_status && 'closed' == $post->ping_status) {
+        echo $none;
+        return;
+    } else {
+        if (!empty($post->post_password)) { // if there's a password
+            if ($_COOKIE['wp-postpass_'.COOKIEHASH] != $post->post_password) {  // and it doesn't match the cookie
+                echo('Enter your password to view comments');
+                return;
+            }
+        }
+        echo '<a href="';
+        if ($wpcommentsjavascript) {
+            if ( empty($wpcommentspopupfile) )
+                $home = get_settings('home');
+            else
+                $home = get_settings('siteurl');
+            echo $home . '/' . $wpcommentspopupfile.'?comments_popup='.$id;
+            echo '" onclick="wpopen(this.href); return false"';
+        } else { // if comments_popup_script() is not in the template, display simple comment link
+            if ( 0 == $number )
+                echo get_permalink() . '#respond';
+            else
+                comments_link();
+            echo '"';
+        }
+        if (!empty($CSSclass)) {
+            echo ' class="'.$CSSclass.'"';
+        }
+        echo '>';
+        comments_number($zero, $one, $more, $number);
+        echo '</a>';
+    }
     }
 }