← Back to branch summary

~canonical-sysadmins/wordpress/4.7.1

« back to all changes in this revision

Viewing changes to wp-includes/pluggable.php

  • Committer: Barry Price
  • Date: 2016-06-22 02:23:41 UTC
  • mfrom: (1.1.17 upstream)
  • Revision ID: barry.price@canonical.com-20160622022341-9qrp2nesacwfx017
Merge WP4.5.3 from upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
wp-includes/pluggable.php
984
984
                }
985
985
        }
986
986
 
987
 
        if ( is_user_admin() ) {
988
 
                $scheme = 'logged_in';
989
 
        } else {
990
 
                /**
991
 
                 * Filter the authentication redirect scheme.
992
 
                 *
993
 
                 * @since 2.9.0
994
 
                 *
995
 
                 * @param string $scheme Authentication redirect scheme. Default empty.
996
 
                 */
997
 
                $scheme = apply_filters( 'auth_redirect_scheme', '' );
998
 
        }
 
987
        /**
 
988
         * Filters the authentication redirect scheme.
 
989
         *
 
990
         * @since 2.9.0
 
991
         *
 
992
         * @param string $scheme Authentication redirect scheme. Default empty.
 
993
         */
 
994
        $scheme = apply_filters( 'auth_redirect_scheme', '' );
999
995
 
1000
996
        if ( $user_id = wp_validate_auth_cookie( '',  $scheme) ) {
1001
997
                /**