Ticket #21509: 21509.patch

wp-includes/version.php

@@ -11 +11 @@
  *
  * @global int $wp_db_version
  */
-$wp_db_version = 21501;
+$wp_db_version = 21530;
 
 /**
  * Holds the TinyMCE version

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

@@ -169 +169 @@
          * @see wp_xmlrpc_server::login
          */
         function login_pass_ok($user_login, $user_pass) {
-                if ( !get_option( 'enable_xmlrpc' ) ) {
-                        $this->error = new IXR_Error( 405, sprintf( __( 'XML-RPC services are disabled on this site. An admin user can enable them at %s'),  admin_url('options-writing.php') ) );
-                        return false;
-                }
-
                 if (!user_pass_ok($user_login, $user_pass)) {
                         $this->error = new IXR_Error(403, __('Bad login/pass combination.'));
                         return false;
@@ -191 +186 @@
          * @return mixed WP_User object if authentication passed, false otherwise
          */
         function login($username, $password) {
-                if ( !get_option( 'enable_xmlrpc' ) ) {
-                        $this->error = new IXR_Error( 405, sprintf( __( 'XML-RPC services are disabled on this site. An admin user can enable them at %s'),  admin_url('options-writing.php') ) );
-                        return false;
-                }
-
                 $user = wp_authenticate($username, $password);
 
                 if (is_wp_error($user)) {

wp-admin/includes/upgrade.php

@@ -399 +399 @@
         if ( $wp_current_db_version < 20080 )
                 upgrade_340();
 
-        if ( $wp_current_db_version < 21501 )
+        if ( $wp_current_db_version < 21530 )
                 upgrade_350();
 
         maybe_disable_automattic_widgets();
@@ -1194 +1194 @@
 
         if ( $wp_current_db_version < 21501 && $wpdb->get_var( "SELECT link_id FROM $wpdb->links LIMIT 1" ) )
                 update_option( 'link_manager_enabled', 1 ); // Previously set to 0 by populate_options()
+
+        if ( $wp_current_db_version < 21530 )
+                delete_option( 'enable_xmlrpc' );
 }
 
 /**

wp-admin/includes/schema.php

@@ -445 +445 @@
         // 2.6
         'avatar_default' => 'mystery',
         'enable_app' => 0,
-        'enable_xmlrpc' => 0,
 
         // 2.7
         'large_size_w' => 1024,

wp-admin/options.php

@@ -64 +64 @@
         'media' => array( 'thumbnail_size_w', 'thumbnail_size_h', 'thumbnail_crop', 'medium_size_w', 'medium_size_h', 'large_size_w', 'large_size_h', 'image_default_size', 'image_default_align', 'image_default_link_type', 'embed_autourls', 'embed_size_w', 'embed_size_h' ),
         'privacy' => array( 'blog_public' ),
         'reading' => array( 'posts_per_page', 'posts_per_rss', 'rss_use_excerpt', 'blog_charset', 'show_on_front', 'page_on_front', 'page_for_posts' ),
-        'writing' => array( 'default_post_edit_rows', 'use_smilies', 'default_category', 'default_email_category', 'use_balanceTags', 'default_link_category', 'default_post_format', 'enable_app', 'enable_xmlrpc' ),
+        'writing' => array( 'default_post_edit_rows', 'use_smilies', 'default_category', 'default_email_category', 'use_balanceTags', 'default_link_category', 'default_post_format', 'enable_app' ),
         'options' => array( '' ) );
 
 $mail_options = array('mailserver_url', 'mailserver_port', 'mailserver_login', 'mailserver_pass');

wp-admin/options-writing.php

@@ -179 +179 @@
 <?php _e('Enable the Atom Publishing Protocol.') ?></label><br />
 </fieldset></td>
 </tr>
-<tr valign="top">
-<th scope="row"><?php _e('XML-RPC') ?></th>
-<td><fieldset><legend class="screen-reader-text"><span><?php _e('XML-RPC') ?></span></legend>
-<label for="enable_xmlrpc">
-<input name="enable_xmlrpc" type="checkbox" id="enable_xmlrpc" value="1" <?php checked('1', get_option('enable_xmlrpc')); ?> />
-<?php _e('Enable the WordPress, Movable Type, MetaWeblog and Blogger XML-RPC publishing protocols.') ?></label><br />
-</fieldset></td>
-</tr>
 <?php do_settings_fields('writing', 'remote_publishing'); ?>
 </table>