From b967e5fc8fd93226eba7926c13b73b93878f182b Mon Sep 17 00:00:00 2001
From: Dominik Eckelmann <deckelmann@gmail.com>
Date: Thu, 22 Mar 2012 12:11:31 +0100
Subject: [PATCH] removed requires, changed conf check in xmlrpc.php
---
inc/load.php | 1 +
inc/remote.php | 1 -
lib/exe/xmlrpc.php | 3 +--
3 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/inc/load.php b/inc/load.php
index 3f1f3429f..f3ab5bcdd 100644
--- a/inc/load.php
+++ b/inc/load.php
@@ -77,6 +77,7 @@ function load_autoload($name){
'Sitemapper' => DOKU_INC.'inc/Sitemapper.php',
'PassHash' => DOKU_INC.'inc/PassHash.class.php',
'RemoteAPI' => DOKU_INC.'inc/remote.php',
+ 'RemoteAPICore' => DOKU_INC.'inc/RemoteAPICore.php',
'DokuWiki_Action_Plugin' => DOKU_PLUGIN.'action.php',
'DokuWiki_Admin_Plugin' => DOKU_PLUGIN.'admin.php',
diff --git a/inc/remote.php b/inc/remote.php
index 0347bd900..2ef28afd2 100644
--- a/inc/remote.php
+++ b/inc/remote.php
@@ -1,7 +1,6 @@
<?php
if (!defined('DOKU_INC')) die();
-require_once(DOKU_INC.'inc/RemoteAPICore.php');
class RemoteException extends Exception {}
class RemoteAccessDeniedException extends RemoteException {}
diff --git a/lib/exe/xmlrpc.php b/lib/exe/xmlrpc.php
index cbec90bff..cf3682f11 100644
--- a/lib/exe/xmlrpc.php
+++ b/lib/exe/xmlrpc.php
@@ -2,10 +2,9 @@
if(!defined('DOKU_INC')) define('DOKU_INC',dirname(__FILE__).'/../../');
require_once(DOKU_INC.'inc/init.php');
-require_once(DOKU_INC.'inc/remote.php');
session_write_close(); //close session
-if(!$conf['xmlrpc']) die('XML-RPC server not enabled.');
+if(!$conf['remote']) die('XML-RPC server not enabled.');
/**
* Contains needed wrapper functions and registers all available
--
GitLab