- Patch #7458 by killes: conditionally include xmlrpc.inc.

6 files changed, 15 insertions, 1 deletions

diff --git a/includes/common.inc b/includes/common.inc
index 9b8d6fcc6..f12a6d191 100644
--- a/includes/common.inc
+++ b/includes/common.inc
@@ -1768,7 +1768,6 @@ function truncate_utf8($string, $len) {
 include_once 'includes/theme.inc';
 include_once 'includes/pager.inc';
 include_once 'includes/menu.inc';
-include_once 'includes/xmlrpc.inc';
 include_once 'includes/tablesort.inc';
 include_once 'includes/file.inc';
 
diff --git a/modules/drupal.module b/modules/drupal.module
index 381192a86..10044a2ed 100644
--- a/modules/drupal.module
+++ b/modules/drupal.module
@@ -127,6 +127,8 @@ function drupal_xmlrpc() {
  * Sends a ping to the Drupal directory server.
  */
 function drupal_notify($server) {
+  include_once 'includes/xmlrpc.inc';
+
   global $base_url;
 
   $url = parse_url($server);
@@ -162,6 +164,7 @@ function drupal_info($field = 0) {
  * Implementation of hook_auth().
  */
 function drupal_auth($username, $password, $server) {
+  include_once 'includes/xmlrpc.inc';
 
   $message = new xmlrpcmsg('drupal.login', array(new xmlrpcval($username, 'string'), new xmlrpcval($password, 'string')));
 
@@ -201,6 +204,8 @@ function drupal_page_help() {
  * Remote clients are usually other Drupal instances.
  */
 function drupal_login($arguments) {
+  include_once 'includes/xmlrpc.inc';
+
   $argument = $arguments->getparam(0);
   $username = $argument->scalarval();
   $argument = $arguments->getparam(1);
diff --git a/modules/drupal/drupal.module b/modules/drupal/drupal.module
index 381192a86..10044a2ed 100644
--- a/modules/drupal/drupal.module
+++ b/modules/drupal/drupal.module
@@ -127,6 +127,8 @@ function drupal_xmlrpc() {
  * Sends a ping to the Drupal directory server.
  */
 function drupal_notify($server) {
+  include_once 'includes/xmlrpc.inc';
+
   global $base_url;
 
   $url = parse_url($server);
@@ -162,6 +164,7 @@ function drupal_info($field = 0) {
  * Implementation of hook_auth().
  */
 function drupal_auth($username, $password, $server) {
+  include_once 'includes/xmlrpc.inc';
 
   $message = new xmlrpcmsg('drupal.login', array(new xmlrpcval($username, 'string'), new xmlrpcval($password, 'string')));
 
@@ -201,6 +204,8 @@ function drupal_page_help() {
  * Remote clients are usually other Drupal instances.
  */
 function drupal_login($arguments) {
+  include_once 'includes/xmlrpc.inc';
+
   $argument = $arguments->getparam(0);
   $username = $argument->scalarval();
   $argument = $arguments->getparam(1);
diff --git a/modules/ping.module b/modules/ping.module
index 880886c5a..1822b95cf 100644
--- a/modules/ping.module
+++ b/modules/ping.module
@@ -54,6 +54,8 @@ function _ping_notify($name, $url) {
  * Notifies weblogs.com, blo.gs, and technorati.com of changes at this site.
  */
 function ping_ping($name = '', $url = '') {
+  include_once 'includes/xmlrpc.inc';
+
   $feed = url('node/feed');
 
   $client = new xmlrpc_client('/RPC2', 'rpc.weblogs.com', 80);
diff --git a/modules/ping/ping.module b/modules/ping/ping.module
index 880886c5a..1822b95cf 100644
--- a/modules/ping/ping.module
+++ b/modules/ping/ping.module
@@ -54,6 +54,8 @@ function _ping_notify($name, $url) {
  * Notifies weblogs.com, blo.gs, and technorati.com of changes at this site.
  */
 function ping_ping($name = '', $url = '') {
+  include_once 'includes/xmlrpc.inc';
+
   $feed = url('node/feed');
 
   $client = new xmlrpc_client('/RPC2', 'rpc.weblogs.com', 80);
diff --git a/xmlrpc.php b/xmlrpc.php
index b99f6c651..a9fd0c9d7 100644
--- a/xmlrpc.php
+++ b/xmlrpc.php
@@ -3,6 +3,7 @@
 
 include_once "includes/bootstrap.inc";
 include_once "includes/common.inc";
+include_once 'includes/xmlrpc.inc';
 include_once "includes/xmlrpcs.inc";
 
 $functions = module_invoke_all("xmlrpc");