diff options
| author | Andreas Gohr <andi@splitbrain.org> | 2010-02-01 16:10:25 +0100 |
|---|---|---|
| committer | Andreas Gohr <andi@splitbrain.org> | 2010-02-01 16:10:25 +0100 |
| commit | c2a6d81662045023bdf1617b6b49f71c274d55ca (patch) | |
| tree | 3449fc7e242890cbc1c18293e6efbca7a7403df9 /inc | |
| parent | 0af14a6e25ba35e88d96762bc73325838868e3fe (diff) | |
| download | rpg-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')
| -rw-r--r-- | inc/init.php | 5 | ||||
| -rw-r--r-- | inc/load.php | 5 |
2 files changed, 8 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'); diff --git a/inc/load.php b/inc/load.php index 792f05e27..e06a2c63d 100644 --- a/inc/load.php +++ b/inc/load.php @@ -76,6 +76,11 @@ function load_autoload($name){ 'GeSHi' => DOKU_INC.'inc/geshi.php', 'TarLib' => DOKU_INC.'inc/TarLib.class.php', 'ZibLib' => DOKU_INC.'inc/ZipLib.class.php', + + 'DokuWiki_Action_Plugin' => DOKU_PLUGIN.'action.php', + 'DokuWiki_Admin_Plugin' => DOKU_PLUGIN.'admin.php', + 'DokuWiki_Syntax_Plugin' => DOKU_PLUGIN.'syntax.php', + ); if(isset($classes[$name])){ |