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 /lib/plugins/config | |
| 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 'lib/plugins/config')
| -rw-r--r-- | lib/plugins/config/admin.php | 3 | ||||
| -rw-r--r-- | lib/plugins/config/settings/config.class.php | 2 |
2 files changed, 0 insertions, 5 deletions
diff --git a/lib/plugins/config/admin.php b/lib/plugins/config/admin.php index cbee3440a..7cc2918f4 100644 --- a/lib/plugins/config/admin.php +++ b/lib/plugins/config/admin.php @@ -9,9 +9,6 @@ // must be run within Dokuwiki if(!defined('DOKU_INC')) die(); -if(!defined('DOKU_PLUGIN')) define('DOKU_PLUGIN',DOKU_INC.'lib/plugins/'); -require_once(DOKU_PLUGIN.'admin.php'); - define('CM_KEYMARKER','____'); // used for settings with multiple dimensions of array indices define('PLUGIN_SELF',dirname(__FILE__).'/'); diff --git a/lib/plugins/config/settings/config.class.php b/lib/plugins/config/settings/config.class.php index d995e8a30..f9867b8de 100644 --- a/lib/plugins/config/settings/config.class.php +++ b/lib/plugins/config/settings/config.class.php @@ -528,8 +528,6 @@ if (!class_exists('setting_password')) { } if (!class_exists('setting_email')) { - - require_once(DOKU_INC.'inc/mail.php'); if (!defined('SETTING_EMAIL_PATTERN')) define('SETTING_EMAIL_PATTERN','<^'.PREG_PATTERN_VALID_EMAIL.'$>'); class setting_email extends setting_string { |