Wordpress 2.3.2

[autoinstalls/wordpress.git] / wp-content / themes / default / comments.php

diff --git a/wp-content/themes/default/comments.php b/wp-content/themes/default/comments.php
index ecf0b34959d5ea0bb7a282c17ff37d09e592c2fc..33534ff8dd987bbba021b2fc7c3e86232b30ad70 100644 (file)
--- a/wp-content/themes/default/comments.php
+++ b/wp-content/themes/default/comments.php
@@ -2,46 +2,46 @@
        if ('comments.php' == basename($_SERVER['SCRIPT_FILENAME']))
                die ('Please do not load this page directly. Thanks!');
 
-        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
-                               ?>
+       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
+                       ?>
 
-                               <p class="nocomments">This post is password protected. Enter the password to view comments.<p>
+                       <p class="nocomments">This post is password protected. Enter the password to view comments.</p>
 
-                               <?php
-                               return;
-            }
-        }
+                       <?php
+                       return;
+               }
+       }
 
-               /* This variable is for alternating comment background */
-               $oddcomment = 'alt';
+       /* This variable is for alternating comment background */
+       $oddcomment = 'class="alt" ';
 ?>
 
 <!-- You can start editing here. -->
 
 <?php if ($comments) : ?>
-       <h3 id="comments"><?php comments_number('No Responses', 'One Response', '% Responses' );?> to &#8220;<?php the_title(); ?>&#8221;</h3> 
+       <h3 id="comments"><?php comments_number('No Responses', 'One Response', '% Responses' );?> to &#8220;<?php the_title(); ?>&#8221;</h3>
 
        <ol class="commentlist">
 
        <?php foreach ($comments as $comment) : ?>
 
-               <li class="<?php echo $oddcomment; ?>" id="comment-<?php comment_ID() ?>">
+               <li <?php echo $oddcomment; ?>id="comment-<?php comment_ID() ?>">
                        <cite><?php comment_author_link() ?></cite> Says:
                        <?php if ($comment->comment_approved == '0') : ?>
                        <em>Your comment is awaiting moderation.</em>
                        <?php endif; ?>
                        <br />
 
-                       <small class="commentmetadata"><a href="#comment-<?php comment_ID() ?>" title=""><?php comment_date('F jS, Y') ?> at <?php comment_time() ?></a> <?php edit_comment_link('e','',''); ?></small>
+                       <small class="commentmetadata"><a href="#comment-<?php comment_ID() ?>" title=""><?php comment_date('F jS, Y') ?> at <?php comment_time() ?></a> <?php edit_comment_link('edit','&nbsp;&nbsp;',''); ?></small>
 
                        <?php comment_text() ?>
 
                </li>
 
-       <?php /* Changes every other comment to a different class */
-               if ('alt' == $oddcomment) $oddcomment = '';
-               else $oddcomment = 'alt';
+       <?php
+               /* Changes every other comment to a different class */
+               $oddcomment = ( empty( $oddcomment ) ) ? 'class="alt" ' : '';
        ?>
 
        <?php endforeach; /* end for each comment */ ?>
@@ -50,7 +50,7 @@
 
  <?php else : // this is displayed if there are no comments so far ?>
 
-  <?php if ('open' == $post->comment_status) : ?> 
+       <?php if ('open' == $post->comment_status) : ?>
                <!-- If comments are open, but there are no comments. -->
 
         <?php else : // comments are closed ?>
@@ -66,7 +66,7 @@
 <h3 id="respond">Leave a Reply</h3>
 
 <?php if ( get_option('comment_registration') && !$user_ID ) : ?>
-<p>You must be <a href="<?php echo get_option('siteurl'); ?>/wp-login.php?redirect_to=<?php the_permalink(); ?>">logged in</a> to post a comment.</p>
+<p>You must be <a href="<?php echo get_option('siteurl'); ?>/wp-login.php?redirect_to=<?php echo urlencode(get_permalink()); ?>">logged in</a> to post a comment.</p>
 <?php else : ?>
 
 <form action="<?php echo get_option('siteurl'); ?>/wp-comments-post.php" method="post" id="commentform">
@@ -88,7 +88,7 @@
 
 <?php endif; ?>
 
-<!--<p><small><strong>XHTML:</strong> You can use these tags: <?php echo allowed_tags(); ?></small></p>-->
+<!--<p><small><strong>XHTML:</strong> You can use these tags: <code><?php echo allowed_tags(); ?></code></small></p>-->
 
 <p><textarea name="comment" id="comment" cols="100%" rows="10" tabindex="4"></textarea></p>