Admin: Allow for the consistent filtering of auth_redirect_scheme

Merge of [37651] to the 4.5 branch.

See #37047.

Built from https://develop.svn.wordpress.org/branches/4.5@37757


git-svn-id: http://core.svn.wordpress.org/branches/4.5@37722 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Jeremy Felt 2016-06-21 14:10:30 +00:00
parent f5fdf443eb
commit c75e86705a
2 changed files with 9 additions and 13 deletions

View File

@ -984,18 +984,14 @@ function auth_redirect() {
} }
} }
if ( is_user_admin() ) { /**
$scheme = 'logged_in'; * Filters the authentication redirect scheme.
} else { *
/** * @since 2.9.0
* Filter the authentication redirect scheme. *
* * @param string $scheme Authentication redirect scheme. Default empty.
* @since 2.9.0 */
* $scheme = apply_filters( 'auth_redirect_scheme', '' );
* @param string $scheme Authentication redirect scheme. Default empty.
*/
$scheme = apply_filters( 'auth_redirect_scheme', '' );
}
if ( $user_id = wp_validate_auth_cookie( '', $scheme) ) { if ( $user_id = wp_validate_auth_cookie( '', $scheme) ) {
/** /**

View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.5.3-alpha-37754'; $wp_version = '4.5.3-alpha-37757';
/** /**
* 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.