From ad15db82c169247243e799f8c16eaef89e6138d1 Mon Sep 17 00:00:00 2001 From: andi Date: Fri, 4 Mar 2005 19:41:27 +0100 Subject: load local.php from init.php darcs-hash:20050304184127-9977f-9fbde6f7973ddc0a516f26fc18ee0ff1f19686e3.gz --- conf/dokuwiki.php | 6 ------ 1 file changed, 6 deletions(-) (limited to 'conf/dokuwiki.php') 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(); ?> -- cgit v1.2.3