From d75f77a4102dd4c215189189744d8c619b8c90ad Mon Sep 17 00:00:00 2001 From: Jeremy Felt Date: Tue, 7 Jun 2016 20:49:30 +0000 Subject: [PATCH] Admin: Allow for the consistent filtering of `auth_redirect_scheme` Fixes #37047. Built from https://develop.svn.wordpress.org/trunk@37651 git-svn-id: http://core.svn.wordpress.org/trunk@37617 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/pluggable.php | 20 ++++++++------------ wp-includes/version.php | 2 +- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/wp-includes/pluggable.php b/wp-includes/pluggable.php index 4668c2cb1a..23601501a6 100644 --- a/wp-includes/pluggable.php +++ b/wp-includes/pluggable.php @@ -986,18 +986,14 @@ function auth_redirect() { } } - if ( is_user_admin() ) { - $scheme = 'logged_in'; - } else { - /** - * Filters the authentication redirect scheme. - * - * @since 2.9.0 - * - * @param string $scheme Authentication redirect scheme. Default empty. - */ - $scheme = apply_filters( 'auth_redirect_scheme', '' ); - } + /** + * Filters the authentication redirect scheme. + * + * @since 2.9.0 + * + * @param string $scheme Authentication redirect scheme. Default empty. + */ + $scheme = apply_filters( 'auth_redirect_scheme', '' ); if ( $user_id = wp_validate_auth_cookie( '', $scheme) ) { /** diff --git a/wp-includes/version.php b/wp-includes/version.php index 515c24ebaa..1f2fa38505 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.6-alpha-37650'; +$wp_version = '4.6-alpha-37651'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.