diff options
| author | andi <andi@splitbrain.org> | 2005-03-04 19:41:27 +0100 |
|---|---|---|
| committer | andi <andi@splitbrain.org> | 2005-03-04 19:41:27 +0100 |
| commit | ad15db82c169247243e799f8c16eaef89e6138d1 (patch) | |
| tree | a6f841d5caff2f99891e82427b25414fc0b70293 /conf/dokuwiki.php | |
| parent | 3dc3a5f166aa2c4e345b27f6811db5889261c3d4 (diff) | |
| download | rpg-ad15db82c169247243e799f8c16eaef89e6138d1.tar.gz rpg-ad15db82c169247243e799f8c16eaef89e6138d1.tar.bz2 | |
load local.php from init.php
darcs-hash:20050304184127-9977f-9fbde6f7973ddc0a516f26fc18ee0ff1f19686e3.gz
Diffstat (limited to 'conf/dokuwiki.php')
| -rw-r--r-- | conf/dokuwiki.php | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/conf/dokuwiki.php b/conf/dokuwiki.php index ea29f19e1..c82a7f6f3 100644 --- a/conf/dokuwiki.php +++ b/conf/dokuwiki.php @@ -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(); ?> |