From e7cb32dcb57d3ae03544db66367d6aaa02f7ddf8 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Fri, 29 Jul 2005 17:54:57 +0200 Subject: DOKU_CONF define for config directory #479 darcs-hash:20050729155457-7ad00-94554865259e4cbd6a1c75bb62a93f37304adbf0.gz --- inc/common.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'inc/common.php') diff --git a/inc/common.php b/inc/common.php index eadef5767..ad4de9ffd 100644 --- a/inc/common.php +++ b/inc/common.php @@ -7,7 +7,7 @@ */ if(!defined('DOKU_INC')) define('DOKU_INC',realpath(dirname(__FILE__).'/../').'/'); - require_once(DOKU_INC.'conf/dokuwiki.php'); + require_once(DOKU_CONF.'dokuwiki.php'); require_once(DOKU_INC.'inc/io.php'); require_once(DOKU_INC.'inc/utf8.php'); require_once(DOKU_INC.'inc/mail.php'); @@ -286,7 +286,7 @@ function checkwordblock(){ if(!$conf['usewordblock']) return false; - $blockfile = file(DOKU_INC.'conf/wordblock.conf'); + $blockfile = file(DOKU_CONF.'wordblock.conf'); //how many lines to read at once (to work around some PCRE limits) if(version_compare(phpversion(),'4.3.0','<')){ //old versions of PCRE define a maximum of parenthesises even if no @@ -860,7 +860,7 @@ function check(){ msg('Cachedir is not writable',-1); } - if(is_writable(DOKU_INC.'conf/users.auth.php')){ + if(is_writable(DOKU_CONF.'users.auth.php')){ msg('conf/users.auth.php is writable',1); }else{ msg('conf/users.auth.php is not writable',0); -- cgit v1.2.3