Changeset 6649

Timestamp:

01/24/2008 09:19:42 PM (18 years ago)

Author:

ryan

Message:

check_ajax_referer() should look for *only* the auth_cookie, not others that look like they match. Autosave should know that an ajax response of -1 or 0 is a failure. Props mdawaffe

Location:

trunk/wp-includes

Files:

• js/autosave.js (modified) (2 diffs)
• pluggable.php (modified) (1 diff)
• script-loader.php (modified) (1 diff)

trunk/wp-includes/js/autosave.js

@@ -29 +29 @@
     if(isNaN(res)) {
         message = autosaveL10n.errorText.replace(/%response%/g, response);
-    } else {
+    } else if( res > 0 ) {
         message = autosaveL10n.saveText.replace(/%time%/g, autosave_cur_time());
         jQuery('#post_ID').attr({name: "post_ID"});
@@ -43 +43 @@
         });
         jQuery('#hiddenaction').val('editpost');
+    } else {
+        message = autosaveL10n.failText;
     }
     jQuery('#autosave').html(message);

trunk/wp-includes/pluggable.php

@@ -662 +662 @@
         $cookie = explode('; ', urldecode(empty($_POST['cookie']) ? $_GET['cookie'] : $_POST['cookie'])); // AJAX scripts must pass cookie=document.cookie
         foreach ( $cookie as $tasty ) {
-            if ( false !== strpos($tasty, AUTH_COOKIE) )
+            if ( false !== strpos($tasty, AUTH_COOKIE . '=') ) {
                 $auth_cookie = substr(strstr($tasty, '='), 1);
+                break;
+            }
         }
 

trunk/wp-includes/script-loader.php

@@ -38 +38 @@
         $this->add( 'prototype', '/wp-includes/js/prototype.js', false, '1.6');
 
-        $this->add( 'autosave', '/wp-includes/js/autosave.js', array('jquery', 'schedule'), '20080104');
+        $this->add( 'autosave', '/wp-includes/js/autosave.js', array('prototype', 'sack'), '20080124');
         $this->localize( 'autosave', 'autosaveL10n', array(
             'autosaveInterval' => apply_filters('autosave_interval', '120'),
             'errorText' => __('Error: %response%'),
+            'failText' => __('Error: Autosave Failed.'),
             'saveText' => __('Saved at %time%.'),
             'requestFile' => get_option( 'siteurl' ) . '/wp-admin/admin-ajax.php',