Changeset 17640 for trunk/wp-admin/admin-ajax.php

Timestamp:

04/16/2011 02:37:44 AM (15 years ago)

Author:

azaozz

Message:

Fix two rare regressions: alert when the login has expires and when post is edited by another user, fixes #16928

File:

• trunk/wp-admin/admin-ajax.php (modified) (4 diffs)

trunk/wp-admin/admin-ajax.php

@@ -917 +917 @@
     $do_lock = true;
 
-    $data = '';
+    $data = $alert = '';
     /* translators: draft saved date format, see http://php.net/date */
     $draft_saved_date_format = __('g:i:s a');
@@ -925 +925 @@
     $supplemental = array();
     if ( isset($login_grace_period) )
-        $supplemental['session_expired'] = add_query_arg( 'interim-login', 1, wp_login_url() );
+        $alert .= sprintf( __('Your login has expired. Please open a new browser window and <a href="%s" target="_blank">login again</a>. '), add_query_arg( 'interim-login', 1, wp_login_url() ) );
 
     $id = $revision_id = 0;
@@ -940 +940 @@
         $last_user = get_userdata( $last );
         $last_user_name = $last_user ? $last_user->display_name : __( 'Someone' );
-        $data = new WP_Error( 'locked', sprintf(
-            $_POST['post_type'] == 'page' ? __( 'Autosave disabled: %s is currently editing this page.' ) : __( 'Autosave disabled: %s is currently editing this post.' ),
-            esc_html( $last_user_name )
-        ) );
+        $data = __( 'Autosave disabled.' );
 
         $supplemental['disable_autosave'] = 'disable';
+        $alert .= sprintf( __( '%s is currently editing this article. If you update it, you will overwrite the changes.' ), esc_html( $last_user_name ) );
     }
 
@@ -990 +988 @@
         }
     }
+
+    if ( ! empty($alert) )
+        $supplemental['alert'] = $alert;
 
     $x = new WP_Ajax_Response( array(