Merged in feature/81-dev-dev01 (pull request #5)
auto-patch 81-dev-dev01-2023-12-05T22_45_26 * auto-patch 81-dev-dev01-2023-12-05T22_45_26
This commit is contained in:
@@ -126,7 +126,12 @@ function wp_populate_basic_auth_from_authorization_header() {
|
||||
$token = substr( $header, 6 );
|
||||
$userpass = base64_decode( $token );
|
||||
|
||||
list( $user, $pass ) = explode( ':', $userpass );
|
||||
// There must be at least one colon in the string.
|
||||
if ( ! str_contains( $userpass, ':' ) ) {
|
||||
return;
|
||||
}
|
||||
|
||||
list( $user, $pass ) = explode( ':', $userpass, 2 );
|
||||
|
||||
// Now shove them in the proper keys where we're expecting later on.
|
||||
$_SERVER['PHP_AUTH_USER'] = $user;
|
||||
@@ -134,7 +139,7 @@ function wp_populate_basic_auth_from_authorization_header() {
|
||||
}
|
||||
|
||||
/**
|
||||
* Checks for the required PHP version, and the MySQL extension or
|
||||
* Checks for the required PHP version, and the mysqli extension or
|
||||
* a database drop-in.
|
||||
*
|
||||
* Dies if requirements are not met.
|
||||
@@ -166,7 +171,7 @@ function wp_check_php_mysql_versions() {
|
||||
// This runs before default constants are defined, so we can't assume WP_CONTENT_DIR is set yet.
|
||||
$wp_content_dir = defined( 'WP_CONTENT_DIR' ) ? WP_CONTENT_DIR : ABSPATH . 'wp-content';
|
||||
|
||||
if ( ! function_exists( 'mysqli_connect' ) && ! function_exists( 'mysql_connect' )
|
||||
if ( ! function_exists( 'mysqli_connect' )
|
||||
&& ! file_exists( $wp_content_dir . '/db.php' )
|
||||
) {
|
||||
require_once ABSPATH . WPINC . '/functions.php';
|
||||
@@ -1049,11 +1054,14 @@ function wp_get_active_and_valid_themes() {
|
||||
return $themes;
|
||||
}
|
||||
|
||||
if ( TEMPLATEPATH !== STYLESHEETPATH ) {
|
||||
$themes[] = STYLESHEETPATH;
|
||||
$stylesheet_path = get_stylesheet_directory();
|
||||
$template_path = get_template_directory();
|
||||
|
||||
if ( $template_path !== $stylesheet_path ) {
|
||||
$themes[] = $stylesheet_path;
|
||||
}
|
||||
|
||||
$themes[] = TEMPLATEPATH;
|
||||
$themes[] = $template_path;
|
||||
|
||||
/*
|
||||
* Remove themes from the list of active themes when we're on an endpoint
|
||||
@@ -1865,7 +1873,6 @@ function wp_is_jsonp_request() {
|
||||
$jsonp_enabled = apply_filters( 'rest_jsonp_enabled', true );
|
||||
|
||||
return $jsonp_enabled;
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user