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 /inc/init.php | |
| 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 'inc/init.php')
| -rw-r--r-- | inc/init.php | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/inc/init.php b/inc/init.php index 6fb9559ce..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/'); @@ -37,6 +40,9 @@ if (!defined('DOKU_E_LEVEL')) { error_reporting(DOKU_E_LEVEL); } +// load libraries +require_once(DOKU_INC.'inc/load.php'); + // init memory caches global $cache_revinfo; $cache_revinfo = array(); @@ -155,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'); @@ -245,6 +249,8 @@ init_files(); scriptify(DOKU_CONF.'users.auth'); scriptify(DOKU_CONF.'acl.auth'); +// setup authentication system +auth_setup(); /** * Checks paths from config file @@ -526,7 +532,6 @@ EOT; exit; } - /** * A realpath() replacement * @@ -588,5 +593,3 @@ function fullpath($path,$exists=false){ return $finalpath; } - - |