Changeset 40387 for trunk/src/wp-includes/pluggable.php

Timestamp:

04/06/2017 06:00:16 PM (9 years ago)

Author:

swissspidy

Message:

Load: Only load PasswordHash class when needed.

This reverts [38371] which loaded class-phpass.php early in wp-settings.php and in turn caused backward compatibility problems.

Props DavidAnderson, ketuchetan.
Fixes #39445.

File:

• trunk/src/wp-includes/pluggable.php (modified) (3 diffs)

trunk/src/wp-includes/pluggable.php

@@ -1806 +1806 @@
         // 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 );
         }
@@ -2086 +2087 @@
 
         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);
@@ -2145 +2147 @@
         // 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);