opensourcemirror
/
dokuwiki
mirror of https://github.com/splitbrain/dokuwiki.git
1
0
Fork 0
Code Issues Releases Wiki Activity

load local.php from init.php 

darcs-hash:20050304184127-9977f-9fbde6f7973ddc0a516f26fc18ee0ff1f19686e3.gz
This commit is contained in:
andi 2005-03-04 19:41:27 +01:00
parent 3dc3a5f166
commit ad15db82c1
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
conf/dokuwiki.php
View File

@ -80,10 +80,4 @@ $conf['ftp']['user'] = 'user';
$conf['ftp']['pass'] = 'password';
$conf['ftp']['root'] = '/home/user/htdocs';
//this includes a local config file if exist which make upgrading more easy - just don't touch this
if(!defined('DOKU_INC')) define('DOKU_INC',realpath(dirname(__FILE__).'/../').'/');
@include(DOKU_INC.'conf/local.php');
//a small bugfix for some browsers/proxies just don't touch this either
$lang = array();
?>

6
inc/init.php
View File

@ -5,7 +5,13 @@
// define the include path
if(!defined('DOKU_INC')) define('DOKU_INC',realpath(dirname(__FILE__).'/../').'/');
// load the config file(s)
require_once(DOKU_INC.'conf/dokuwiki.php');
@include_once(DOKU_INC.'conf/local.php');
//prepare language array
$lang = array();
// define baseURL
if(!defined('DOKU_BASE')) define('DOKU_BASE',getBaseURL());