Commit 50cd3048 authored by Dries's avatar Dries

- Patch #7458: bugfix: reverted the conditional inclusion of xmlrpc.inc.
parent c39ac09b
...@@ -127,8 +127,6 @@ function drupal_xmlrpc() { ...@@ -127,8 +127,6 @@ function drupal_xmlrpc() {
* Sends a ping to the Drupal directory server. * Sends a ping to the Drupal directory server.
*/ */
function drupal_notify($server) { function drupal_notify($server) {
include_once 'includes/xmlrpc.inc';
global $base_url; global $base_url;
$url = parse_url($server); $url = parse_url($server);
...@@ -164,7 +162,6 @@ function drupal_info($field = 0) { ...@@ -164,7 +162,6 @@ function drupal_info($field = 0) {
* Implementation of hook_auth(). * Implementation of hook_auth().
*/ */
function drupal_auth($username, $password, $server) { 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'))); $message = new xmlrpcmsg('drupal.login', array(new xmlrpcval($username, 'string'), new xmlrpcval($password, 'string')));
...@@ -204,8 +201,6 @@ function drupal_page_help() { ...@@ -204,8 +201,6 @@ function drupal_page_help() {
* Remote clients are usually other Drupal instances. * Remote clients are usually other Drupal instances.
*/ */
function drupal_login($arguments) { function drupal_login($arguments) {
include_once 'includes/xmlrpc.inc';
$argument = $arguments->getparam(0); $argument = $arguments->getparam(0);
$username = $argument->scalarval(); $username = $argument->scalarval();
$argument = $arguments->getparam(1); $argument = $arguments->getparam(1);
......
...@@ -127,8 +127,6 @@ function drupal_xmlrpc() { ...@@ -127,8 +127,6 @@ function drupal_xmlrpc() {
* Sends a ping to the Drupal directory server. * Sends a ping to the Drupal directory server.
*/ */
function drupal_notify($server) { function drupal_notify($server) {
include_once 'includes/xmlrpc.inc';
global $base_url; global $base_url;
$url = parse_url($server); $url = parse_url($server);
...@@ -164,7 +162,6 @@ function drupal_info($field = 0) { ...@@ -164,7 +162,6 @@ function drupal_info($field = 0) {
* Implementation of hook_auth(). * Implementation of hook_auth().
*/ */
function drupal_auth($username, $password, $server) { 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'))); $message = new xmlrpcmsg('drupal.login', array(new xmlrpcval($username, 'string'), new xmlrpcval($password, 'string')));
...@@ -204,8 +201,6 @@ function drupal_page_help() { ...@@ -204,8 +201,6 @@ function drupal_page_help() {
* Remote clients are usually other Drupal instances. * Remote clients are usually other Drupal instances.
*/ */
function drupal_login($arguments) { function drupal_login($arguments) {
include_once 'includes/xmlrpc.inc';
$argument = $arguments->getparam(0); $argument = $arguments->getparam(0);
$username = $argument->scalarval(); $username = $argument->scalarval();
$argument = $arguments->getparam(1); $argument = $arguments->getparam(1);
......
...@@ -54,7 +54,6 @@ function _ping_notify($name, $url) { ...@@ -54,7 +54,6 @@ function _ping_notify($name, $url) {
* Notifies weblogs.com, blo.gs, and technorati.com of changes at this site. * Notifies weblogs.com, blo.gs, and technorati.com of changes at this site.
*/ */
function ping_ping($name = '', $url = '') { function ping_ping($name = '', $url = '') {
include_once 'includes/xmlrpc.inc';
$feed = url('node/feed'); $feed = url('node/feed');
......
...@@ -54,7 +54,6 @@ function _ping_notify($name, $url) { ...@@ -54,7 +54,6 @@ function _ping_notify($name, $url) {
* Notifies weblogs.com, blo.gs, and technorati.com of changes at this site. * Notifies weblogs.com, blo.gs, and technorati.com of changes at this site.
*/ */
function ping_ping($name = '', $url = '') { function ping_ping($name = '', $url = '') {
include_once 'includes/xmlrpc.inc';
$feed = url('node/feed'); $feed = url('node/feed');
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment