Changes in branches/3.0 [16807:16641]

Location:

branches/3.0

Files:

• readme.html (modified) (1 diff)
• wp-admin/includes/update-core.php (modified) (1 diff)
• wp-content/plugins (modified) (1 prop)
• wp-includes/version.php (modified) (1 diff)
• xmlrpc.php (modified) (10 diffs)

branches/3.0/readme.html

@@ -9 +9 @@
 <h1 id="logo">
         <a href="http://wordpress.org/"><img alt="WordPress" src="wp-admin/images/wordpress-logo.png" width="250" height="68" /></a>
-        <br /> Version 3.0.3
+        <br /> Version 3.0.2
 </h1>
 <p style="text-align: center">Semantic Personal Publishing Platform</p>

branches/3.0/wp-admin/includes/update-core.php

@@ -275 +275 @@
         $required_php_version = '4.3';
         $required_mysql_version = '4.1.2';
-        $wp_version = '3.0.3';
+        $wp_version = '3.0.2';
         $php_compat     = version_compare( $php_version, $required_php_version, '>=' );
         $mysql_compat   = version_compare( $mysql_version, $required_mysql_version, '>=' ) || file_exists( WP_CONTENT_DIR . '/db.php' );

branches/3.0/wp-content/plugins

@@ -1 @@
-akismet -r319080 http://plugins.svn.wordpress.org/akismet/trunk/
+akismet http://plugins.svn.wordpress.org/akismet/trunk/

@@ -1 @@
-akismet -r319080 http://plugins.svn.wordpress.org/akismet/trunk/
+akismet http://plugins.svn.wordpress.org/akismet/trunk/

branches/3.0/wp-includes/version.php

@@ -9 +9 @@
  * @global string $wp_version
  */
-$wp_version = '3.0.3';
+$wp_version = '3.0.2';
 
 /**

branches/3.0/xmlrpc.php

@@ -1157 +1157 @@
                 do_action('xmlrpc_call', 'wp.deleteComment');
 
-                if ( !$comment = get_comment( $comment_ID ) )
+                if ( ! get_comment($comment_ID) )
                         return new IXR_Error( 404, __( 'Invalid comment ID.' ) );
-
-                if ( !current_user_can( 'edit_post', $comment->comment_post_ID ) )
-                        return new IXR_Error( 403, __( 'You are not allowed to moderate comments on this site.' ) );
 
                 return wp_delete_comment($comment_ID);
@@ -1189 +1186 @@
                         return new IXR_Error( 403, __( 'You are not allowed to moderate comments on this site.' ) );
 
-                if ( !$comment = get_comment( $comment_ID ) )
+                do_action('xmlrpc_call', 'wp.editComment');
+
+                if ( ! get_comment($comment_ID) )
                         return new IXR_Error( 404, __( 'Invalid comment ID.' ) );
-
-                if ( !current_user_can( 'edit_post', $comment->comment_post_ID ) )
-                        return new IXR_Error( 403, __( 'You are not allowed to moderate comments on this site.' ) );
-
-                do_action('xmlrpc_call', 'wp.editComment');
 
                 if ( isset($content_struct['status']) ) {
@@ -1424 +1418 @@
                         return $this->error;
 
-                if ( !current_user_can( 'edit_pages' ) )
+                if ( !current_user_can( 'edit_posts' ) )
                         return new IXR_Error( 403, __( 'You are not allowed access to details about this site.' ) );
 
@@ -1964 +1958 @@
                         return new IXR_Error(404, __('Sorry, no such post.'));
 
-                if ( !current_user_can('delete_post', $post_ID) )
+                if ( !current_user_can('edit_post', $post_ID) )
                         return new IXR_Error(401, __('Sorry, you do not have the right to delete this post.'));
 
@@ -1994 +1988 @@
                 $password   = $args[2];
                 $content_struct = $args[3];
-                $publish     = isset( $args[4] ) ? $args[4] : 0;
+                $publish     = $args[4];
 
                 if ( !$user = $this->login($username, $password) )
@@ -2001 +1995 @@
                 do_action('xmlrpc_call', 'metaWeblog.newPost');
 
+                $cap = ( $publish ) ? 'publish_posts' : 'edit_posts';
+                $error_message = __( 'Sorry, you are not allowed to publish posts on this site.' );
+                $post_type = 'post';
                 $page_template = '';
                 if ( !empty( $content_struct['post_type'] ) ) {
                         if ( $content_struct['post_type'] == 'page' ) {
-                                if ( $publish || 'publish' == $content_struct['page_status'])
-                                        $cap  = 'publish_pages';
-                                else
-                                        $cap = 'edit_pages';
+                                $cap = ( $publish ) ? 'publish_pages' : 'edit_pages';
                                 $error_message = __( 'Sorry, you are not allowed to publish pages on this site.' );
                                 $post_type = 'page';
@@ -2013 +2007 @@
                                         $page_template = $content_struct['wp_page_template'];
                         } elseif ( $content_struct['post_type'] == 'post' ) {
-                                if ( $publish || 'publish' == $content_struct['post_status'])
-                                        $cap  = 'publish_posts';
-                                else
-                                        $cap = 'edit_posts';
-                                $error_message = __( 'Sorry, you are not allowed to publish posts on this site.' );
-                                $post_type = 'post';
+                                // This is the default, no changes needed
                         } else {
                                 // No other post_type values are allowed here
                                 return new IXR_Error( 401, __( 'Invalid post type.' ) );
                         }
-                } else {
-                        if ( $publish || 'publish' == $content_struct['post_status'])
-                                $cap  = 'publish_posts';
-                        else
-                                $cap = 'edit_posts';
-                        $error_message = __( 'Sorry, you are not allowed to publish posts on this site.' );
-                        $post_type = 'post';
                 }
 
@@ -2294 +2276 @@
                 if ( !empty( $content_struct['post_type'] ) ) {
                         if ( $content_struct['post_type'] == 'page' ) {
-                                if ( $publish || 'publish' == $content_struct['page_status'] )
-                                        $cap  = 'publish_pages';
-                                else
-                                        $cap = 'edit_pages';
+                                $cap = ( $publish ) ? 'publish_pages' : 'edit_pages';
                                 $error_message = __( 'Sorry, you are not allowed to publish pages on this site.' );
                                 $post_type = 'page';
@@ -2303 +2282 @@
                                         $page_template = $content_struct['wp_page_template'];
                         } elseif ( $content_struct['post_type'] == 'post' ) {
-                                if ( $publish || 'publish' == $content_struct['post_status'] )
-                                        $cap  = 'publish_posts';
-                                else
-                                        $cap = 'edit_posts';
-                                $error_message = __( 'Sorry, you are not allowed to publish posts on this site.' );
-                                $post_type = 'post';
+                                // This is the default, no changes needed
                         } else {
                                 // No other post_type values are allowed here
                                 return new IXR_Error( 401, __( 'Invalid post type.' ) );
                         }
-                } else {
-                        if ( $publish || 'publish' == $content_struct['post_status'] )
-                                $cap  = 'publish_posts';
-                        else
-                                $cap = 'edit_posts';
-                        $error_message = __( 'Sorry, you are not allowed to publish posts on this site.' );
-                        $post_type = 'post';
                 }
 
@@ -3135 +3102 @@
                 do_action('xmlrpc_call', 'mt.publishPost');
 
-                if ( !current_user_can('publish_posts') || !current_user_can('edit_post', $post_ID) )
+                if ( !current_user_can('edit_post', $post_ID) )
                         return new IXR_Error(401, __('Sorry, you cannot edit this post.'));
 

@@ -1 @@
-akismet -r319080 http://plugins.svn.wordpress.org/akismet/trunk/
+akismet http://plugins.svn.wordpress.org/akismet/trunk/