Changeset 40387

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.

Location:

trunk/src

Files:

• wp-includes/pluggable.php (modified) (3 diffs)
• wp-includes/post-template.php (modified) (1 diff)
• wp-includes/user.php (modified) (2 diffs)
• wp-login.php (modified) (1 diff)
• wp-settings.php (modified) (1 diff)

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);

trunk/src/wp-includes/post-template.php

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

trunk/src/wp-includes/user.php

@@ -2122 +2122 @@
         // 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 );
         }
@@ -2166 +2167 @@
 
         if ( empty( $wp_hasher ) ) {
+                require_once ABSPATH . WPINC . '/class-phpass.php';
                 $wp_hasher = new PasswordHash( 8, true );
         }

trunk/src/wp-login.php

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

trunk/src/wp-settings.php

@@ -101 +101 @@
 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.