diff options
| author | Andreas Gohr <andi@splitbrain.org> | 2010-03-12 14:11:50 +0100 |
|---|---|---|
| committer | Andreas Gohr <andi@splitbrain.org> | 2010-03-12 14:11:50 +0100 |
| commit | d7879495eef6e6a998f5d727304e88dfa5420108 (patch) | |
| tree | 720cee6a7b738e5fec32492b4f6c1cf69312583d /lib/plugins/config | |
| parent | 84645d8c01570c5ea4cda556e70beccdec25ee22 (diff) | |
| parent | 05ed2c25ea0dc45eef2af0f9f4176c939af41100 (diff) | |
| download | rpg-d7879495eef6e6a998f5d727304e88dfa5420108.tar.gz rpg-d7879495eef6e6a998f5d727304e88dfa5420108.tar.bz2 | |
Merge branch 'requireall'
Conflicts:
inc/fulltext.php
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 a6f652d79..b7428bf6c 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 { |