summaryrefslogtreecommitdiff
path: root/inc/common.php
diff options
context:
space:
mode:
authorandi <andi@splitbrain.org>2005-06-05 12:38:42 +0200
committerandi <andi@splitbrain.org>2005-06-05 12:38:42 +0200
commitf62ea8a1d1cf10eddeae777b11420624e111b7ea (patch)
tree87a15e898308a5de1ef37874645a4cdcb83c707b /inc/common.php
parent248a73214063d2fe47787c8c4aa292777cddb12b (diff)
downloadrpg-f62ea8a1d1cf10eddeae777b11420624e111b7ea.tar.gz
rpg-f62ea8a1d1cf10eddeae777b11420624e111b7ea.tar.bz2
directory layout cleanup !IMPORTANT
This patch changes the directory structure of dokuwiki as suggested in http://www.freelists.org/archives/dokuwiki/06-2005/msg00045.html As the changes.log is not managed through darcs you need to move it your self to the new location in data/changes.log I think I modified the code at all nessessary places, but I may have forgotten a few things. darcs-hash:20050605103842-9977f-af20f63c1d604888375d175d89ac6bd71566d47d.gz
Diffstat (limited to 'inc/common.php')
-rw-r--r--inc/common.php10
1 files changed, 7 insertions, 3 deletions
diff --git a/inc/common.php b/inc/common.php
index 162a1a8e4..99cec10a9 100644
--- a/inc/common.php
+++ b/inc/common.php
@@ -105,7 +105,11 @@ function msg($message,$lvl=0){
}else{
$MSG = array();
$MSG[]=array('lvl' => $errors[$lvl], 'msg' => $message);
- html_msgarea();
+ if(function_exists('html_msgarea')){
+ html_msgarea();
+ }else{
+ print "ERROR($lvl) $message";
+ }
}
}
@@ -244,7 +248,7 @@ function checkwordblock(){
if(!$conf['usewordblock']) return false;
- $blockfile = file('conf/wordblock.conf');
+ $blockfile = file(DOKU_INC.'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
@@ -799,7 +803,7 @@ function check(){
msg('Mediadir is not writable',-1);
}
- if(is_writable('conf/users.auth.php')){
+ if(is_writable(DOKU_INC.'conf/users.auth.php')){
msg('conf/users.auth.php is writable',1);
}else{
msg('conf/users.auth.php is not writable',0);