Ticket #4721: 4721.diff

wp-content/themes/classic/comments-popup.php

@@ -34 +34 @@
 $comments = get_approved_comments($id);
 $commentstatus = get_post($id);
 if (!empty($commentstatus->post_password) && $_COOKIE['wp-postpass_'. COOKIEHASH] != $commentstatus->post_password) {  // and it doesn't match the cookie
-        echo(get_the_password_form());
+        echo(get_the_password_form($post->ID));
 } else { ?>
 
 <?php if ($comments) { ?>

wp-content/themes/default/comments-popup.php

@@ -34 +34 @@
 $comments = get_approved_comments($id);
 $post = get_post($id);
 if (!empty($post->post_password) && $_COOKIE['wp-postpass_'. COOKIEHASH] != $post->post_password) {  // and it doesn't match the cookie
-        echo(get_the_password_form());
+        echo(get_the_password_form($post->ID));
 } else { ?>
 
 <?php if ($comments) { ?>

wp-includes/feed-atom-comments.php

@@ -51 +51 @@
                 <updated><?php echo mysql2date('Y-m-d\TH:i:s\Z', get_comment_time('Y-m-d H:i:s', true), false); ?></updated>
                 <published><?php echo mysql2date('Y-m-d\TH:i:s\Z', get_comment_time('Y-m-d H:i:s', true), false); ?></published>
 <?php if (!empty($comment_post->post_password) && $_COOKIE['wp-postpass'] != $comment_post->post_password) : ?>
-                <content type="html" xml:base="<?php comment_link(); ?>"><![CDATA[<?php echo get_the_password_form(); ?>]]></content>
+                <content type="html" xml:base="<?php comment_link(); ?>"><![CDATA[<?php echo get_the_password_form($comment_post->ID); ?>]]></content>
 <?php else : // post pass ?>
                 <content type="html" xml:base="<?php comment_link(); ?>"><![CDATA[<?php comment_text(); ?>]]></content>
 <?php endif; // post pass

wp-includes/feed-rss2-comments.php

@@ -43 +43 @@
                 <guid><?php comment_link() ?></guid>
 <?php if (!empty($comment_post->post_password) && $_COOKIE['wp-postpass'] != $comment_post->post_password) : ?>
                 <description><?php _e('Protected Comments: Please enter your password to view comments.'); ?></description>
-                <content:encoded><![CDATA[<?php echo get_the_password_form() ?>]]></content:encoded>
+                <content:encoded><![CDATA[<?php echo get_the_password_form($comment_post->ID) ?>]]></content:encoded>
 <?php else : // post pass ?>
                 <description><?php comment_text_rss() ?></description>
                 <content:encoded><![CDATA[<?php comment_text() ?>]]></content:encoded>

wp-includes/post-template.php

@@ -69 +69 @@
 
         if ( !empty($post->post_password) ) { // if there's a password
                 if ( stripslashes($_COOKIE['wp-postpass_'.COOKIEHASH]) != $post->post_password ) {      // and it doesn't match the cookie
-                        $output = get_the_password_form();
+                        $output = get_the_password_form($id);
                         return $output;
                 }
         }
@@ -463 +463 @@
 // Misc
 //
 
-function get_the_password_form() {
+function get_the_password_form($id = 0) {
+        $label = 'pwbox-'.(empty($id) ? rand() : $id);
         $output = '<form action="' . get_option('siteurl') . '/wp-pass.php" method="post">
         <p>' . __("This post is password protected. To view it please enter your password below:") . '</p>
-        <p><label>' . __("Password:") . ' <input name="post_password" type="password" size="20" /></label> <input type="submit" name="Submit" value="' . __("Submit") . '" /></p>
+        <p><label for="'.$label.'">' . __("Password:") . ' <input name="post_password" type="password" size="20" id="'.$label.'" /></label> <input type="submit" name="Submit" value="' . __("Submit") . '" /></p>
         </form>
         ';
         return $output;