summaryrefslogtreecommitdiff
path: root/inc/init.php
diff options
context:
space:
mode:
authorAndreas Gohr <andi@splitbrain.org>2010-02-01 16:10:25 +0100
committerAndreas Gohr <andi@splitbrain.org>2010-02-01 16:10:25 +0100
commitc2a6d81662045023bdf1617b6b49f71c274d55ca (patch)
tree3449fc7e242890cbc1c18293e6efbca7a7403df9 /inc/init.php
parent0af14a6e25ba35e88d96762bc73325838868e3fe (diff)
downloadrpg-c2a6d81662045023bdf1617b6b49f71c274d55ca.tar.gz
rpg-c2a6d81662045023bdf1617b6b49f71c274d55ca.tar.bz2
plugin related autoloading
This patch moved the place where DOKU_PLUGIN is defined. It no longer can be set from a normal config (only via preload)
Diffstat (limited to 'inc/init.php')
-rw-r--r--inc/init.php5
1 files changed, 3 insertions, 2 deletions
diff --git a/inc/init.php b/inc/init.php
index 3cff40073..7f4792cfa 100644
--- a/inc/init.php
+++ b/inc/init.php
@@ -20,6 +20,9 @@ if (@file_exists($preload)) include($preload);
// define the include path
if(!defined('DOKU_INC')) define('DOKU_INC',fullpath(dirname(__FILE__).'/../').'/');
+// define Plugin dir
+if(!defined('DOKU_PLUGIN')) define('DOKU_PLUGIN',DOKU_INC.'lib/plugins/');
+
// define config path (packagers may want to change this to /etc/dokuwiki/)
if(!defined('DOKU_CONF')) define('DOKU_CONF',DOKU_INC.'conf/');
@@ -158,8 +161,6 @@ if(!defined('DOKU_TAB')) define ('DOKU_TAB',"\t");
// define cookie and session id, append server port when securecookie is configured FS#1664
if (!defined('DOKU_COOKIE')) define('DOKU_COOKIE', 'DW'.md5(DOKU_REL.(($conf['securecookie'])?$_SERVER['SERVER_PORT']:'')));
-// define Plugin dir
-if(!defined('DOKU_PLUGIN')) define('DOKU_PLUGIN',DOKU_INC.'lib/plugins/');
// define main script
if(!defined('DOKU_SCRIPT')) define('DOKU_SCRIPT','doku.php');