Ticket #39445: 39445.2.patch

src/wp-includes/pluggable.php

@@ -1805 +1805 @@
 
         // Now insert the key, hashed, into the DB.
         if ( empty( $wp_hasher ) ) {
+                require_once ABSPATH . WPINC . '/class-phpass.php';
                 $wp_hasher = new PasswordHash( 8, true );
         }
         $hashed = time() . ':' . $wp_hasher->HashPassword( $key );
@@ -2085 +2086 @@
         global $wp_hasher;
 
         if ( empty($wp_hasher) ) {
+                require_once ABSPATH . WPINC . '/class-phpass.php';
                 // By default, use the portable hash from phpass
                 $wp_hasher = new PasswordHash(8, true);
         }
@@ -2144 +2146 @@
         // If the stored hash is longer than an MD5, presume the
         // new style phpass portable hash.
         if ( empty($wp_hasher) ) {
+                require_once ABSPATH . WPINC . '/class-phpass.php';
                 // By default, use the portable hash from phpass
                 $wp_hasher = new PasswordHash(8, true);
         }

src/wp-includes/post-template.php

@@ -792 +792 @@
                 /** This filter is documented in wp-includes/post.php */
                 return apply_filters( 'post_password_required', true, $post );
         }
-
+        
+        require_once ABSPATH . WPINC . '/class-phpass.php';
         $hasher = new PasswordHash( 8, true );
 
         $hash = wp_unslash( $_COOKIE[ 'wp-postpass_' . COOKIEHASH ] );

src/wp-includes/user.php

@@ -2121 +2121 @@
 
         // Now insert the key, hashed, into the DB.
         if ( empty( $wp_hasher ) ) {
+                require_once ABSPATH . WPINC . '/class-phpass.php';
                 $wp_hasher = new PasswordHash( 8, true );
         }
         $hashed = time() . ':' . $wp_hasher->HashPassword( $key );
@@ -2165 +2166 @@
                 return new WP_Error('invalid_key', __('Invalid key'));
 
         if ( empty( $wp_hasher ) ) {
+                require_once ABSPATH . WPINC . '/class-phpass.php';
                 $wp_hasher = new PasswordHash( 8, true );
         }
 

src/wp-login.php

@@ -438 +438 @@
                 exit();
         }
 
+        require_once ABSPATH . WPINC . '/class-phpass.php';
         $hasher = new PasswordHash( 8, true );
 
         /**

src/wp-settings.php

@@ -100 +100 @@
 require( ABSPATH . WPINC . '/class-wp.php' );
 require( ABSPATH . WPINC . '/class-wp-error.php' );
 require( ABSPATH . WPINC . '/pomo/mo.php' );
-require( ABSPATH . WPINC . '/class-phpass.php' );
 
 // Include the wpdb class and, if present, a db.php database drop-in.
 global $wpdb;