Changeset 8151 for branches/crazyhorse/xmlrpc.php

Timestamp:

06/20/2008 09:27:53 PM (17 years ago)

Author:

mdawaffe

Message:

crazyhorse: merge with log:trunk@8115:8150

File:

• branches/crazyhorse/xmlrpc.php (modified) (4 diffs)

branches/crazyhorse/xmlrpc.php

@@ -40 +40 @@
     <homePageLink><?php bloginfo_rss('url') ?></homePageLink>
     <apis>
+    <?php if ( get_option('enable_xmlrpc') ) :?>
       <api name="WordPress" blogID="1" preferred="true" apiLink="<?php bloginfo_rss('wpurl') ?>/xmlrpc.php" />
       <api name="Movable Type" blogID="1" preferred="false" apiLink="<?php bloginfo_rss('wpurl') ?>/xmlrpc.php" />
       <api name="MetaWeblog" blogID="1" preferred="false" apiLink="<?php bloginfo_rss('wpurl') ?>/xmlrpc.php" />
       <api name="Blogger" blogID="1" preferred="false" apiLink="<?php bloginfo_rss('wpurl') ?>/xmlrpc.php" />
+    <?php endif; if ( get_option('enable_app') ) :?>
       <api name="Atom" blogID="" preferred="false" apiLink="<?php echo apply_filters('atom_service_url', (get_bloginfo('url')."/wp-app.php/service"))?>" />
+    <?php endif; ?>
     </apis>
   </service>
@@ -109 +112 @@
 
     function wp_xmlrpc_server() {
-        $this->methods = array(
+        $xmlrpc_methods = array(
             // WordPress API
             'wp.getUsersBlogs'      => 'this:wp_getUsersBlogs',
@@ -165 +168 @@
             'mt.supportedTextFilters' => 'this:mt_supportedTextFilters',
             'mt.getTrackbackPings' => 'this:mt_getTrackbackPings',
-            'mt.publishPost' => 'this:mt_publishPost',
-
+            'mt.publishPost' => 'this:mt_publishPost'
+        );
+        
+        $xmlrpc_functions = array (
             // PingBack
             'pingback.ping' => 'this:pingback_ping',
@@ -175 +180 @@
         );
 
+        if ( get_option('enable_xmlrpc') )
+        {
+            $this->methods = array_merge($xmlrpc_methods,$xmlrpc_functions);
+        } else {
+            $this->methods = $xmlrpc_functions;
+        }
+        
         $this->initialise_blog_option_info( );
         $this->methods = apply_filters('xmlrpc_methods', $this->methods);