diff options
| author | Dominik Eckelmann <deckelmann@gmail.com> | 2012-03-22 12:11:31 +0100 |
|---|---|---|
| committer | Dominik Eckelmann <deckelmann@gmail.com> | 2012-03-22 12:11:31 +0100 |
| commit | b967e5fc8fd93226eba7926c13b73b93878f182b (patch) | |
| tree | a04a0983256349745e849ca1d39b1a4a265c769f | |
| parent | 37e579189fae39899d3856598affa31dfd39328b (diff) | |
| download | rpg-b967e5fc8fd93226eba7926c13b73b93878f182b.tar.gz rpg-b967e5fc8fd93226eba7926c13b73b93878f182b.tar.bz2 | |
removed requires, changed conf check in xmlrpc.php
| -rw-r--r-- | inc/load.php | 1 | ||||
| -rw-r--r-- | inc/remote.php | 1 | ||||
| -rw-r--r-- | 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 |