Changeset 38371

Timestamp:

08/26/2016 05:39:37 PM (8 years ago)

Author:

wonderboymusic

Message:

Load: load class-phpass.php (PasswordHash class) early in wp-settings.php, instead of require_once()'ing it in several places.

See #36335.

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

@@ -1740 +1740 @@
     // 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 );
     }
@@ -2015 +2014 @@
 
     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);
@@ -2075 +2073 @@
     // 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

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

trunk/src/wp-includes/user.php

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

trunk/src/wp-login.php

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

trunk/src/wp-settings.php

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