Changeset 12068

Timestamp:

10/20/2009 05:00:34 PM (17 years ago)

Author:

westi

Message:

Backport of the switch of the post|page being editing message from a create_function call to a normal function and reduce the duplicated code. See #10729 for 2.8 branch.

Location:

branches/2.8/wp-admin

Files:

• includes/post.php (modified) (1 diff)
• page.php (modified) (1 diff)
• post.php (modified) (1 diff)

branches/2.8/wp-admin/includes/post.php

@@ -1058 +1058 @@
         if ( !add_post_meta( $post->ID, '_edit_last', $current_user->ID, true ) )
                 update_post_meta( $post->ID, '_edit_last', $current_user->ID );
+}
+
+/**
+ * Outputs the notice message to say that someone else is editing this post at the moment.
+ * 
+ * @since 2.8.5
+ * @return none
+ */
+function _admin_notice_post_locked() {
+        global $post;
+        $last_user = get_userdata( get_post_meta( $post->ID, '_edit_last', true ) );
+        $last_user_name = $last_user ? $last_user->display_name : __('Somebody');
+        
+        switch ($post->post_type) {
+                case 'post':
+                        $message = __( 'Warning: %s is currently editing this post' );
+                        break;
+                case 'page':
+                        $message = __( 'Warning: %s is currently editing this page' );
+                        break;
+                default:
+                        $message = __( 'Warning: %s is currently editing this.' );
+        }
+        
+        $message = sprintf( $message, esc_html( $last_user_name ) );
+        echo "<div class='error'><p>$message</p></div>";        
 }
 

branches/2.8/wp-admin/page.php

@@ -99 +99 @@
         if ( current_user_can('edit_page', $page_ID) ) {
                 if ( $last = wp_check_post_lock( $post->ID ) ) {
-                        $last_user = get_userdata( $last );
-                        $last_user_name = $last_user ? $last_user->display_name : __('Somebody');
-                        $message = sprintf( __( 'Warning: %s is currently editing this page' ), esc_html( $last_user_name ) );
-                        $message = str_replace( "'", "\'", "<div class='error'><p>$message</p></div>" );
-                        add_action('admin_notices', create_function( '', "echo '$message';" ) );
+                        add_action('admin_notices', '_admin_notice_post_locked' );
                 } else {
                         wp_set_post_lock( $post->ID );

branches/2.8/wp-admin/post.php

@@ -134 +134 @@
         if ( current_user_can('edit_post', $post_ID) ) {
                 if ( $last = wp_check_post_lock( $post->ID ) ) {
-                        $last_user = get_userdata( $last );
-                        $last_user_name = $last_user ? $last_user->display_name : __('Somebody');
-                        $message = sprintf( __( 'Warning: %s is currently editing this post' ), esc_html( $last_user_name ) );
-                        $message = str_replace( "'", "\'", "<div class='error'><p>$message</p></div>" );
-                        add_action('admin_notices', create_function( '', "echo '$message';" ) );
+                        add_action('admin_notices', '_admin_notice_post_locked' );
                 } else {
                         wp_set_post_lock( $post->ID );