Ticket #19798: 19798.patch

wp-includes/post-template.php

@@ -1215 +1215 @@
 function get_the_password_form() {
         global $post;
         $label = 'pwbox-' . ( empty($post->ID) ? rand() : $post->ID );
-        $output = '<form action="' . site_url('wp-pass.php') . '" method="post">
+        $output = '<form action="' . esc_url( site_url( 'wp-login.php?action=postpass', 'login_post' ) ) . '" method="post">
         <p>' . __("This post 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__("Submit") . '" /></p>
         </form>

wp-login.php

@@ -339 +339 @@
         $action = 'resetpass';
 
 // validate action so as to default to the login screen
-if ( !in_array($action, array('logout', 'lostpassword', 'retrievepassword', 'resetpass', 'rp', 'register', 'login'), true) && false === has_filter('login_form_' . $action) )
+if ( !in_array( $action, array( 'postpass', 'logout', 'lostpassword', 'retrievepassword', 'resetpass', 'rp', 'register', 'login' ), true ) && false === has_filter( 'login_form_' . $action ) )
         $action = 'login';
 
 nocache_headers();
@@ -367 +367 @@
 $http_post = ('POST' == $_SERVER['REQUEST_METHOD']);
 switch ($action) {
 
+case 'postpass' :
+        // 10 days
+        setcookie('wp-postpass_' . COOKIEHASH, stripslashes( $_POST['post_password'] ), time() + 864000, COOKIEPATH);
+
+        wp_safe_redirect( wp_get_referer() );
+        exit();
+
+break;
+
 case 'logout' :
         check_admin_referer('log-out');
         wp_logout();

wp-pass.php

@@ -1 @@
-<?php
-/**
- * Creates the password cookie and redirects back to where the
- * visitor was before.
- *
- * @package WordPress
- */
-
-/** Make sure that the WordPress bootstrap has run before continuing. */
-require( dirname(__FILE__) . '/wp-load.php');
-
-// 10 days
-setcookie('wp-postpass_' . COOKIEHASH, stripslashes( $_POST['post_password'] ), time() + 864000, COOKIEPATH);
-
-wp_safe_redirect(wp_get_referer());
-exit;