Ticket #16483: 16483.6.diff

src/wp-includes/post-template.php

@@ -782 +782 @@
         if ( empty( $post->post_password ) )
                 return false;
 
-        if ( ! isset( $_COOKIE['wp-postpass_' . COOKIEHASH] ) )
+        if ( ! isset( $_COOKIE["wp-postpass_{$post->ID}_" . COOKIEHASH] ) )
                 return true;
 
         require_once ABSPATH . WPINC . '/class-phpass.php';
         $hasher = new PasswordHash( 8, true );
 
-        $hash = wp_unslash( $_COOKIE[ 'wp-postpass_' . COOKIEHASH ] );
+        $hash = wp_unslash( $_COOKIE[ "wp-postpass_{$post->ID}_" . COOKIEHASH ] );
         if ( 0 !== strpos( $hash, '$P$B' ) )
                 return true;
 
@@ -1540 +1540 @@
  */
 function get_the_password_form( $post = 0 ) {
         $post = get_post( $post );
-        $label = 'pwbox-' . ( empty($post->ID) ? rand() : $post->ID );
+        $post_id = empty( $post->ID ) ? rand() : $post->ID;
+        $label = 'pwbox-' . $post_id;
         $output = '<form action="' . esc_url( site_url( 'wp-login.php?action=postpass', 'login_post' ) ) . '" class="post-password-form" method="post">
         <p>' . __( 'This content is password protected. To view it please enter your password below:' ) . '</p>
-        <p><label for="' . $label . '">' . __( 'Password:' ) . ' <input name="post_password" id="' . $label . '" type="password" size="20" /></label> <input type="submit" name="Submit" value="' . esc_attr_x( 'Enter', 'post password form' ) . '" /></p></form>
+        <p><label for="' . $label . '">' . __( 'Password:' ) . ' <input name="post_password" id="' . $label . '" type="password" size="20" /></label> <input type="hidden" name="post_id" value="' . $post_id . '" /> <input type="submit" name="Submit" value="' . esc_attr_x( 'Enter', 'post password form' ) . '" /></p></form>
         ';
 
         /**

src/wp-login.php

@@ -464 +464 @@
         } else {
                 $secure = false;
         }
-        setcookie( 'wp-postpass_' . COOKIEHASH, $hasher->HashPassword( wp_unslash( $_POST['post_password'] ) ), $expire, COOKIEPATH, COOKIE_DOMAIN, $secure );
+        setcookie( "wp-postpass_{$_POST['post_id']}_" . COOKIEHASH, $hasher->HashPassword( wp_unslash( $_POST['post_password'] ) ), $expire, COOKIEPATH, COOKIE_DOMAIN, $secure );
 
         wp_safe_redirect( wp_get_referer() );
         exit();