Wordpress 3.0.3-scripts

[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 94a677a92f3aa9f6c14c8aed0d8b98ce69c83b14..186a73ca16e2fbc75695c724a5df59cf9c272539 100644 (file)
--- a/wp-content/themes/default/comments.php
+++ b/wp-content/themes/default/comments.php
@@ -35,7 +35,7 @@
        </div>
  <?php else : // this is displayed if there are no comments so far ?>
 
        </div>
  <?php else : // this is displayed if there are no comments so far ?>
 

-       <?php if ('open' == $post->comment_status) : ?>
+       <?php if ( comments_open() ) : ?>

                <!-- If comments are open, but there are no comments. -->
 
         <?php else : // comments are closed ?>
                <!-- If comments are open, but there are no comments. -->
 
         <?php else : // comments are closed ?>


@@ -46,7 +46,7 @@
 <?php endif; ?>
 
 
 <?php endif; ?>
 
 

-<?php if ('open' == $post->comment_status) : ?>
+<?php if ( comments_open() ) : ?>

 
 <div id="respond">
 
 
 <div id="respond">
 


@@ -56,32 +56,32 @@
        <small><?php cancel_comment_reply_link(); ?></small>
 </div>
 
        <small><?php cancel_comment_reply_link(); ?></small>
 </div>
 

-<?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 echo urlencode(get_permalink()); ?>">logged in</a> to post a comment.</p>
+<?php if ( get_option('comment_registration') && !is_user_logged_in() ) : ?>
+<p>You must be <a href="<?php echo wp_login_url( 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">
 
 <?php else : ?>
 
 <form action="<?php echo get_option('siteurl'); ?>/wp-comments-post.php" method="post" id="commentform">
 

-<?php if ( $user_ID ) : ?>
+<?php if ( is_user_logged_in() ) : ?>

 
 <p>Logged in as <a href="<?php echo get_option('siteurl'); ?>/wp-admin/profile.php"><?php echo $user_identity; ?></a>. <a href="<?php echo wp_logout_url(get_permalink()); ?>" title="Log out of this account">Log out &raquo;</a></p>
 
 <?php else : ?>
 
 
 <p>Logged in as <a href="<?php echo get_option('siteurl'); ?>/wp-admin/profile.php"><?php echo $user_identity; ?></a>. <a href="<?php echo wp_logout_url(get_permalink()); ?>" title="Log out of this account">Log out &raquo;</a></p>
 
 <?php else : ?>
 

-<p><input type="text" name="author" id="author" value="<?php echo $comment_author; ?>" size="22" tabindex="1" <?php if ($req) echo "aria-required='true'"; ?> />
+<p><input type="text" name="author" id="author" value="<?php echo esc_attr($comment_author); ?>" size="22" tabindex="1" <?php if ($req) echo "aria-required='true'"; ?> />

 <label for="author"><small>Name <?php if ($req) echo "(required)"; ?></small></label></p>
 
 <label for="author"><small>Name <?php if ($req) echo "(required)"; ?></small></label></p>
 

-<p><input type="text" name="email" id="email" value="<?php echo $comment_author_email; ?>" size="22" tabindex="2" <?php if ($req) echo "aria-required='true'"; ?> />
+<p><input type="text" name="email" id="email" value="<?php echo esc_attr($comment_author_email); ?>" size="22" tabindex="2" <?php if ($req) echo "aria-required='true'"; ?> />

 <label for="email"><small>Mail (will not be published) <?php if ($req) echo "(required)"; ?></small></label></p>
 
 <label for="email"><small>Mail (will not be published) <?php if ($req) echo "(required)"; ?></small></label></p>
 

-<p><input type="text" name="url" id="url" value="<?php echo $comment_author_url; ?>" size="22" tabindex="3" />
+<p><input type="text" name="url" id="url" value="<?php echo esc_attr($comment_author_url); ?>" size="22" tabindex="3" />

 <label for="url"><small>Website</small></label></p>
 
 <?php endif; ?>
 
 <!--<p><small><strong>XHTML:</strong> You can use these tags: <code><?php echo allowed_tags(); ?></code></small></p>-->
 
 <label for="url"><small>Website</small></label></p>
 
 <?php endif; ?>
 
 <!--<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>
+<p><textarea name="comment" id="comment" cols="58" rows="10" tabindex="4"></textarea></p>

 
 <p><input name="submit" type="submit" id="submit" tabindex="5" value="Submit Comment" />
 <?php comment_id_fields(); ?>
 
 <p><input name="submit" type="submit" id="submit" tabindex="5" value="Submit Comment" />
 <?php comment_id_fields(); ?>