From 0373a7bd299bb5a3bb883a08b6039aa0a54982bc Mon Sep 17 00:00:00 2001
From: Pascal Birchler <pascal.birchler@gmail.com>
Date: Thu, 6 Apr 2017 18:23:35 +0000
Subject: [PATCH] Bootstrap/Load: Only load `PasswordHash` class once.

`require_once` prevents errors when loading WordPress and the class already exists.

See [40387].
Fixes #39445.

Built from https://develop.svn.wordpress.org/branches/4.7@40389


git-svn-id: http://core.svn.wordpress.org/branches/4.7@40296 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/version.php | 2 +-
 wp-settings.php         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/wp-includes/version.php b/wp-includes/version.php
index bbe795314a..227e8cfa35 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.7.4-alpha-40388';
+$wp_version = '4.7.4-alpha-40389';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.
diff --git a/wp-settings.php b/wp-settings.php
index 8dd0f40317..ee89150ea2 100644
--- a/wp-settings.php
+++ b/wp-settings.php
@@ -100,7 +100,7 @@ require( ABSPATH . WPINC . '/class-wp-matchesmapregex.php' );
 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' );
+require_once( ABSPATH . WPINC . '/class-phpass.php' );
 
 // Include the wpdb class and, if present, a db.php database drop-in.
 global $wpdb;