Changeset 21804

Timestamp:

09/11/2012 12:37:31 AM (12 years ago)

Author:

nacin

Message:

Turn XML-RPC on and remove the option on the Writing Settings page.
props markoheijnen for the initial patch.

Introduces a new filter, xmlrpc_enabled.

Respects any current callbacks registered to the pre_option_enable_xmlrpc
and option_enable_xmlrpc filters, for anyone forcing it off via code.

fixes #21509.

Location:

trunk

Files:

• wp-admin/includes/schema.php (modified) (2 diffs)
• wp-admin/includes/upgrade.php (modified) (1 diff)
• wp-admin/options-writing.php (modified) (1 diff)
• wp-admin/options.php (modified) (1 diff)
• wp-includes/class-wp-xmlrpc-server.php (modified) (2 diffs)
• wp-includes/version.php (modified) (1 diff)

trunk/wp-admin/includes/schema.php

@@ -446 +446 @@
     'avatar_default' => 'mystery',
     'enable_app' => 0,
-    'enable_xmlrpc' => 0,
 
     // 2.7
@@ -544 +543 @@
         'can_compress_scripts', 'page_uris', 'update_core', 'update_plugins', 'update_themes', 'doing_cron',
         'random_seed', 'rss_excerpt_length', 'secret', 'use_linksupdate', 'default_comment_status_page',
-        'wporg_popular_tags', 'what_to_show', 'rss_language', 'language',
+        'wporg_popular_tags', 'what_to_show', 'rss_language', 'language', 'enable_xmlrpc',
     );
     foreach ( $unusedoptions as $option )

trunk/wp-admin/includes/upgrade.php

@@ -998 +998 @@
     if ( $wp_current_db_version < 8201 ) {
         update_option('enable_app', 1);
-        update_option('enable_xmlrpc', 1);
     }
 }

trunk/wp-admin/options-writing.php

@@ -180 +180 @@
 </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>

trunk/wp-admin/options.php

@@ -65 +65 @@
     '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( '' ) );
 

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

@@ -170 +170 @@
      */
     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') ) );
+
+        // Respect any old filters against get_option() for 'enable_xmlrpc'.
+        $enabled = apply_filters( 'pre_option_enable_xmlrpc', false ); // Deprecated
+        if ( false === $enabled )
+            $enabled = apply_filters( 'option_enable_xmlrpc', true ); // Deprecated
+
+        // Proper filter for turning off XML-RPC. It is on by default.
+        $enabled = apply_filters( 'xmlrpc_enabled', $enabled );
+
+        if ( ! $enabled ) {
+            $this->error = new IXR_Error( 405, sprintf( __( 'XML-RPC services are disabled on this site.' ) ) );
             return false;
         }
@@ -192 +201 @@
      */
     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') ) );
+        // Respect any old filters against get_option() for 'enable_xmlrpc'.
+        $enabled = apply_filters( 'pre_option_enable_xmlrpc', false ); // Deprecated
+        if ( false === $enabled )
+            $enabled = apply_filters( 'option_enable_xmlrpc', true ); // Deprecated
+
+        // Proper filter for turning off XML-RPC. It is on by default.
+        $enabled = apply_filters( 'xmlrpc_enabled', $enabled );
+
+        if ( ! $enabled ) {
+            $this->error = new IXR_Error( 405, sprintf( __( 'XML-RPC services are disabled on this site.' ) ) );
             return false;
         }

trunk/wp-includes/version.php

@@ -12 +12 @@
  * @global int $wp_db_version
  */
-$wp_db_version = 21707;
+$wp_db_version = 21804;
 
 /**