Context Navigation

← Previous Change
Next Change →

functions.php

Timestamp:

07/18/2013 07:06:35 PM (13 years ago)

Author:

ryan

Message:

Fire wp_auth_check_load() from admin_enqueue_scripts instead of admin_init so that it can access the current screen object.

Black list the update and upgrade screens.

Allow plugins to white/black list screens via the wp_auth_check_load filter.

Props nacin

see #23295

File:

: 1 edited

trunk/wp-includes/functions.php (modified) (2 diffs)

Legend:

: Unmodified
: Added
: Removed

trunk/wp-includes/functions.php

-              r24723
+              r24738
 /**
  * Load the auth check for monitoring whether the user is still logged in.
+ * Can be disabled with remove_action( 'admin_init', 'wp_auth_check_load' );
+ *
+ * Can be disabled with remove_action( 'admin_enqueue_scripts', 'wp_auth_check_load' );
+ *
+ * This is disabled for certain screens where a login screen could cause an
+ * inconvenient interruption. A filter called wp_auth_check_load can be used
+ * for fine-grained control.
+ *
  * @since 3.6.0
+ *
- * @return void
  */
 function wp_auth_check_load() {
+        global $pagenow;
+        // Don't load for these types of requests
+        if ( defined('XMLRPC_REQUEST') || defined('IFRAME_REQUEST') || 'wp-login.php' == $pagenow )
+        if ( ! is_admin() && ! is_user_logged_in() )
                 return;
+        if ( is_admin() || is_user_logged_in() ) {
+                if ( defined('DOING_AJAX') ) {
+                        add_filter( 'heartbeat_received', 'wp_auth_check', 10, 2 );
+                        add_filter( 'heartbeat_nopriv_received', 'wp_auth_check', 10, 2 );
+                } else {
+                        wp_enqueue_style( 'wp-auth-check' );
+                        wp_enqueue_script( 'wp-auth-check' );
+                        if ( is_admin() )
+                                add_action( 'admin_print_footer_scripts', 'wp_auth_check_html', 5 );
+                        else
+                                add_action( 'wp_print_footer_scripts', 'wp_auth_check_html', 5 );
+                }
+        }
+}
+/**
+ * Output the HTML that shows the wp-login dialog when the user is no longer logged in
+        if ( defined( 'IFRAME_REQUEST' ) )
+                return;
+        $screen = get_current_screen();
+        $hidden = array( 'update', 'update-network', 'update-core', 'update-core-network', 'upgrade', 'upgrade-network', 'network' );
+        $show = ! in_array( $screen->id, $hidden );
+        if ( apply_filters( 'wp_auth_check_load', $show, $screen ) ) {
+                wp_enqueue_style( 'wp-auth-check' );
+                wp_enqueue_script( 'wp-auth-check' );
+                add_action( 'admin_print_footer_scripts', 'wp_auth_check_html', 5 );
+                add_action( 'wp_print_footer_scripts', 'wp_auth_check_html', 5 );
+        }
+}
+/**
+ * Output the HTML that shows the wp-login dialog when the user is no longer logged in.
+ *
+ * @since 3.6.0
  */
 function wp_auth_check_html() {
 …
 /**
+ * Check whether a user is still logged in, and act accordingly if not.
+ * Check whether a user is still logged in, for the heartbeat.
+ *
+ * Send a result that shows a log-in box if the user is no longer logged in,
+ * or if their cookie is within the grace period.
+ *
  * @since 3.6.0
  */
 function wp_auth_check( $response, $data ) {
+        if ( ! isset( $data['wp-auth-check'] ) )
+                return $response;
+        // If the user is logged in and we are outside the login grace period, bail.
+        if ( is_user_logged_in() && empty( $GLOBALS['login_grace_period'] ) )
+                return array_merge( $response, array( 'wp-auth-check' => '1' ) );
+        return array_merge( $response, array( 'wp-auth-check' => 'show' ) );
+        $response['wp-auth-check'] = is_user_logged_in() && empty( $GLOBALS['login_grace_period'] );
+        return $response;
+}

Note: See TracChangeset for help on using the changeset viewer.

Make WordPress Core

Context Navigation

Changeset 24738 for trunk/wp-includes/functions.php

Legend:

trunk/wp-includes/functions.php

Download in other formats: