Changeset 24273

Timestamp:

05/16/2013 03:47:09 AM (12 years ago)

Author:

azaozz

Message:

Separate the nonces update from checking the post lock. Fix scheduling the logged out check. See #23697, see #23295.

Location:

trunk

Files:

• wp-admin/includes/misc.php (modified) (2 diffs)
• wp-admin/js/post.js (modified) (3 diffs)
• wp-includes/js/wp-auth-check.js (modified) (2 diffs)

trunk/wp-admin/includes/misc.php

@@ -624 +624 @@
         }
 
+        $response['wp-refresh-post-lock'] = $send;
+    }
+
+    return $response;
+}
+add_filter( 'heartbeat_received', 'wp_refresh_post_lock', 10, 3 );
+
+/**
+ * Check nonce expiration on the New/Edit Post screen and refresh if needed
+ *
+ * @since 3.6
+ */
+function wp_refresh_post_nonces( $response, $data, $screen_id ) {
+    if ( 'post' == $screen_id && array_key_exists( 'wp-refresh-post-nonces', $data ) ) {
+        $received = $data['wp-refresh-post-nonces'];
+
+        if ( ! $post_id = absint( $received['post_id'] ) )
+            return $response;
+
+        if ( ! current_user_can('edit_post', $post_id) )
+            return $response;
+
         if ( ! empty( $received['post_nonce'] ) && 2 === wp_verify_nonce( $received['post_nonce'], 'update-post_' . $post_id ) ) {
-            $send['update_nonces'] = array(
+            $response['wp-refresh-post-nonces'] = array(
                 'replace-autosavenonce' => wp_create_nonce('autosave'),
                 'replace-getpermalinknonce' => wp_create_nonce('getpermalink'),
@@ -634 +656 @@
             );
         }
-
-        $response['wp-refresh-post-lock'] = $send;
     }
 
     return $response;
 }
-add_filter( 'heartbeat_received', 'wp_refresh_post_lock', 10, 3 );
+add_filter( 'heartbeat_received', 'wp_refresh_post_nonces', 10, 3 );
 
 /**

trunk/wp-admin/js/post.js

@@ -255 +255 @@
     var lock = $('#active_post_lock').val(),
         post_id = $('#post_ID').val(),
-        post_nonce = $('#_wpnonce').val(),
         send = {};
 
@@ -265 +264 @@
     if ( lock )
         send['lock'] = lock;
-
-    if ( post_nonce )
-        send['post_nonce'] = post_nonce;
 
     data['wp-refresh-post-lock'] = send;
@@ -320 +316 @@
 });
 
+}(jQuery));
+
+(function($) {
+    var check, timeout;
+
+    function schedule() {
+        check = false;
+        window.clearTimeout( timeout );
+        timeout = window.setTimeout( function(){ check = 1; }, 3600000 );
+    }
+
+    $(document).on( 'heartbeat-send.wp-refresh-nonces', function( e, data ) { 
+        var nonce, post_id;
+
+        if ( check ) {
+            if ( ( post_id = $('#post_ID').val() ) && ( nonce = $('#_wpnonce').val() ) ) {
+                data['wp-refresh-post-nonces'] = {
+                    post_id: post_id,
+                    post_nonce: nonce
+                };
+            }
+            check = 2;
+        }
+    }).on( 'heartbeat-tick.wp-refresh-nonces', function( e, data ) {
+        if ( check === 2 )
+            schedule();
+
+        if ( data['wp-refresh-post-nonces'] ) {
+            $.each( data['wp-refresh-post-nonces'], function( selector, value ) {
+                if ( selector.match(/^replace-/) )
+                    $( '#' + selector.replace('replace-', '') ).val( value );
+            });
+        }
+    }).ready( function() {
+        schedule();
+    });
 }(jQuery));
 

trunk/wp-includes/js/wp-auth-check.js

@@ -73 +73 @@
         check = false;
         window.clearTimeout( timeout );
-        timeout = window.setTimeout( function(){ check = true; }, 180000 ); // 3 min.
+        timeout = window.setTimeout( function(){ check = 1; }, 180000 ); // 3 min.
     }
 
     $( document ).on( 'heartbeat-tick.wp-auth-check', function( e, data ) {
-        if ( check )
+        if ( check === 2 )
             schedule();
 
@@ -104 +104 @@
             if ( check || ! empty )
                 data['wp-auth-check'] = 1;
+
+            if ( check )
+                check = 2;
         });
     });