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/usermanager | |
| 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/usermanager')
| -rw-r--r-- | lib/plugins/usermanager/admin.php | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/lib/plugins/usermanager/admin.php b/lib/plugins/usermanager/admin.php index da6029bbf..4eb923bb1 100644 --- a/lib/plugins/usermanager/admin.php +++ b/lib/plugins/usermanager/admin.php @@ -13,9 +13,7 @@ // must be run within Dokuwiki if(!defined('DOKU_INC')) die(); -if(!defined('DOKU_PLUGIN')) define('DOKU_PLUGIN',DOKU_INC.'lib/plugins/'); if(!defined('DOKU_PLUGIN_IMAGES')) define('DOKU_PLUGIN_IMAGES',DOKU_BASE.'lib/plugins/usermanager/images/'); -require_once(DOKU_PLUGIN.'admin.php'); /** * All DokuWiki plugins to extend the admin function |