Changeset 18584

Timestamp:

08/23/2011 10:22:34 AM (15 years ago)

Author:

nacin

Message:

Check for comment existence before checking edit_comment meta cap. props xknown, fixes #18104.

File:

• trunk/wp-includes/class-wp-xmlrpc-server.php (modified) (2 diffs)

trunk/wp-includes/class-wp-xmlrpc-server.php

@@ -1135 +1135 @@
                         return new IXR_Error( 403, __( 'You are not allowed to moderate comments on this site.' ) );
 
+                if ( ! get_comment($comment_ID) )
+                        return new IXR_Error( 404, __( 'Invalid comment ID.' ) );
+
                 if ( !current_user_can( 'edit_comment', $comment_ID ) )
                         return new IXR_Error( 403, __( 'You are not allowed to moderate comments on this site.' ) );
 
                 do_action('xmlrpc_call', 'wp.deleteComment');
-
-                if ( ! get_comment($comment_ID) )
-                        return new IXR_Error( 404, __( 'Invalid comment ID.' ) );
 
                 return wp_delete_comment($comment_ID);
@@ -1185 +1185 @@
                         return new IXR_Error( 403, __( 'You are not allowed to moderate comments on this site.' ) );
 
+                if ( ! get_comment($comment_ID) )
+                        return new IXR_Error( 404, __( 'Invalid comment ID.' ) );
+
                 if ( !current_user_can( 'edit_comment', $comment_ID ) )
                         return new IXR_Error( 403, __( 'You are not allowed to moderate comments on this site.' ) );
 
                 do_action('xmlrpc_call', 'wp.editComment');
-
-                if ( ! get_comment($comment_ID) )
-                        return new IXR_Error( 404, __( 'Invalid comment ID.' ) );
 
                 if ( isset($content_struct['status']) ) {