Changes from tags/2.3.2 at r56785 to tags/2.3.3 at r56785

Location:

tags/2.3.3

Files:

• wp-admin/install-helper.php (modified) (1 diff)
• wp-includes/gettext.php (modified) (1 diff)
• wp-includes/pluggable.php (modified) (1 diff)
• wp-includes/version.php (modified) (1 diff)
• xmlrpc.php (modified) (2 diffs)

tags/2.3.3/wp-admin/install-helper.php

@@ -1 +1 @@
 <?php
-require_once('../wp-config.php');
+require_once(dirname(dirname(__FILE__)).'/wp-config.php');
 $debug = 0;
 

tags/2.3.3/wp-includes/gettext.php

@@ -115 +115 @@
         $this->STREAM = $Reader;
         $magic = $this->readint();
-        if ($magic == ($MAGIC1 & 0xFFFFFFFF) || $magic == ($MAGIC3 & 0xFFFFFFFF)) { // to make sure it works for 64-bit platforms
+        if ($magic == $MAGIC1 || $magic == $MAGIC3) { // to make sure it works for 64-bit platforms
             $this->BYTEORDER = 0;
         } elseif ($magic == ($MAGIC2 & 0xFFFFFFFF)) {

tags/2.3.3/wp-includes/pluggable.php

@@ -226 +226 @@
     // Set the from name and email
     $phpmailer->From = apply_filters( 'wp_mail_from', $from_email );
-    $phpmailer->Sender = apply_filters( 'wp_mail_from', $from_email );
     $phpmailer->FromName = apply_filters( 'wp_mail_from_name', $from_name );
 

tags/2.3.3/wp-includes/version.php

@@ -3 +3 @@
 // This holds the version number in a separate file so we can bump it without cluttering the SVN
 
-$wp_version = '2.3.2';
+$wp_version = '2.3.3';
 $wp_db_version = 6124;
 

tags/2.3.3/xmlrpc.php

@@ -976 +976 @@
         return $this->error;
       }
-
-      $cap = ($publish) ? 'publish_posts' : 'edit_posts';
       $user = set_current_user(0, $user_login);
-      if ( !current_user_can($cap) )
-        return new IXR_Error(401, __('Sorry, you are not allowed to post on this blog.'));
-
-        // The post_type defaults to post, but could also be page.
-        $post_type = "post";
-        if(
-            !empty($content_struct["post_type"])
-            && ($content_struct["post_type"] == "page")
-        ) {
-            $post_type = "page";
+
+        $cap = ( $publish ) ? 'publish_posts' : 'edit_posts';
+        $error_message = __( 'Sorry, you are not allowed to publish posts on this blog.' );
+        $post_type = 'post';
+        if( !empty( $content_struct['post_type'] ) ) {
+            if( $content_struct['post_type'] == 'page' ) {
+                $cap = ( $publish ) ? 'publish_pages' : 'edit_pages';
+                $error_message = __( 'Sorry, you are not allowed to publish pages on this blog.' );
+                $post_type = 'page';
+            }
+            elseif( $content_type['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.' ) );
+            }
+        }
+
+        if( !current_user_can( $cap ) ) {
+            return new IXR_Error( 401, $error_message );
         }
 
@@ -1188 +1197 @@
         return $this->error;
       }
-
         $user = set_current_user(0, $user_login);
 
-        // The post_type defaults to post, but could also be page.
-        $post_type = "post";
-        if(
-            !empty($content_struct["post_type"])
-            && ($content_struct["post_type"] == "page")
-        ) {
-            $post_type = "page";
-        }
-
-      // Edit page caps are checked in editPage.  Just check post here.
-      if ( ( 'post' == $post_type ) && !current_user_can('edit_post', $post_ID) )
-        return new IXR_Error(401, __('Sorry, you can not edit this post.'));
+        $cap = ( $publish ) ? 'publish_posts' : 'edit_posts';
+        $error_message = __( 'Sorry, you are not allowed to publish posts on this blog.' );
+        $post_type = 'post';
+        if( !empty( $content_struct['post_type'] ) ) {
+            if( $content_struct['post_type'] == 'page' ) {
+                $cap = ( $publish ) ? 'publish_pages' : 'edit_pages';
+                $error_message = __( 'Sorry, you are not allowed to publish pages on this blog.' );
+                $post_type = 'page';
+            }
+            elseif( $content_type['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.' ) );
+            }
+        }
+
+        if( !current_user_can( $cap ) ) {
+            return new IXR_Error( 401, $error_message );
+        }
 
       $postdata = wp_get_single_post($post_ID, ARRAY_A);