Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-09-27 14:53:08 +02:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
See #36335.

Built from https://develop.svn.wordpress.org/trunk@38371


git-svn-id: http://core.svn.wordpress.org/trunk@38312 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Scott Taylor 2016-08-26 17:40:35 +00:00
parent f189b72b22
commit 481123661c
6 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
wp-includes/pluggable.php
View File

@ -1739,7 +1739,6 @@ function wp_new_user_notification( $user_id, $deprecated = null, $notify = '' )
// Now insert the key, hashed, into the DB. // Now insert the key, hashed, into the DB.
if ( empty( $wp_hasher ) ) { if ( empty( $wp_hasher ) ) {
require_once ABSPATH . WPINC . '/class-phpass.php';
$wp_hasher = new PasswordHash( 8, true ); $wp_hasher = new PasswordHash( 8, true );
} }
$hashed = time() . ':' . $wp_hasher->HashPassword( $key ); $hashed = time() . ':' . $wp_hasher->HashPassword( $key );
@ -2014,7 +2013,6 @@ function wp_hash_password($password) {
global $wp_hasher; global $wp_hasher;
if ( empty($wp_hasher) ) { if ( empty($wp_hasher) ) {
require_once( ABSPATH . WPINC . '/class-phpass.php');
// By default, use the portable hash from phpass // By default, use the portable hash from phpass
$wp_hasher = new PasswordHash(8, true); $wp_hasher = new PasswordHash(8, true);
} }
@ -2074,7 +2072,6 @@ function wp_check_password($password, $hash, $user_id = '') {
// If the stored hash is longer than an MD5, presume the // If the stored hash is longer than an MD5, presume the
// new style phpass portable hash. // new style phpass portable hash.
if ( empty($wp_hasher) ) { if ( empty($wp_hasher) ) {
require_once( ABSPATH . WPINC . '/class-phpass.php');
// By default, use the portable hash from phpass // By default, use the portable hash from phpass
$wp_hasher = new PasswordHash(8, true); $wp_hasher = new PasswordHash(8, true);
} }

1
wp-includes/post-template.php
View File

@ -785,7 +785,6 @@ function post_password_required( $post = null ) {
if ( ! isset( $_COOKIE['wp-postpass_' . COOKIEHASH] ) ) if ( ! isset( $_COOKIE['wp-postpass_' . COOKIEHASH] ) )
return true; return true;
require_once ABSPATH . WPINC . '/class-phpass.php';
$hasher = new PasswordHash( 8, true ); $hasher = new PasswordHash( 8, true );
$hash = wp_unslash( $_COOKIE[ 'wp-postpass_' . COOKIEHASH ] ); $hash = wp_unslash( $_COOKIE[ 'wp-postpass_' . COOKIEHASH ] );

2
wp-includes/user.php
View File

@ -2095,7 +2095,6 @@ function get_password_reset_key( $user ) {
// Now insert the key, hashed, into the DB. // Now insert the key, hashed, into the DB.
if ( empty( $wp_hasher ) ) { if ( empty( $wp_hasher ) ) {
require_once ABSPATH . WPINC . '/class-phpass.php';
$wp_hasher = new PasswordHash( 8, true ); $wp_hasher = new PasswordHash( 8, true );
} }
$hashed = time() . ':' . $wp_hasher->HashPassword( $key ); $hashed = time() . ':' . $wp_hasher->HashPassword( $key );
@ -2140,7 +2139,6 @@ function check_password_reset_key($key, $login) {
return new WP_Error('invalid_key', __('Invalid key')); return new WP_Error('invalid_key', __('Invalid key'));
if ( empty( $wp_hasher ) ) { if ( empty( $wp_hasher ) ) {
require_once ABSPATH . WPINC . '/class-phpass.php';
$wp_hasher = new PasswordHash( 8, true ); $wp_hasher = new PasswordHash( 8, true );
} }

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.7-alpha-38370'; $wp_version = '4.7-alpha-38371';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.

1
wp-login.php
View File

@ -439,7 +439,6 @@ case 'postpass' :
exit(); exit();
} }
require_once ABSPATH . WPINC . '/class-phpass.php';
$hasher = new PasswordHash( 8, true ); $hasher = new PasswordHash( 8, true );
/** /**

1
wp-settings.php
View File

@ -95,6 +95,7 @@ require( ABSPATH . WPINC . '/functions.php' );
require( ABSPATH . WPINC . '/class-wp.php' ); require( ABSPATH . WPINC . '/class-wp.php' );
require( ABSPATH . WPINC . '/class-wp-error.php' ); require( ABSPATH . WPINC . '/class-wp-error.php' );
require( ABSPATH . WPINC . '/pomo/mo.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. // Include the wpdb class and, if present, a db.php database drop-in.
global $wpdb; global $wpdb;