diff options
| author | andi <andi@splitbrain.org> | 2005-04-29 12:45:45 +0200 |
|---|---|---|
| committer | andi <andi@splitbrain.org> | 2005-04-29 12:45:45 +0200 |
| commit | 92b83b77a91e8d0d82845ec6783c3a181068071d (patch) | |
| tree | 3bcb797d548268fcc8b68cb51e767ea77f69573a | |
| parent | f1cf0e104cb77e2d01c6e388dbe0dba3a99d8f78 (diff) | |
| download | rpg-92b83b77a91e8d0d82845ec6783c3a181068071d.tar.gz rpg-92b83b77a91e8d0d82845ec6783c3a181068071d.tar.bz2 | |
basedir option added #292
darcs-hash:20050429104545-9977f-ac44f6be6333965c96a5d3bca7acde9f610d4d78.gz
| -rw-r--r-- | conf/dokuwiki.php | 3 | ||||
| -rw-r--r-- | inc/init.php | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/conf/dokuwiki.php b/conf/dokuwiki.php index 444a18fdc..f5aabd189 100644 --- a/conf/dokuwiki.php +++ b/conf/dokuwiki.php @@ -12,12 +12,11 @@ $conf['umask'] = 0111; //set the umask for new files $conf['dmask'] = 0000; //directory mask accordingly $conf['lang'] = 'en'; //your language +$conf['basedir'] = ''; //relative dir to serveroot - blank for autodetection $conf['datadir'] = './data'; //where to store the data $conf['olddir'] = './attic'; //where to store old revisions $conf['mediadir'] = './media'; //where to store media files -$conf['mediaweb'] = 'media'; //access to media from the web $conf['changelog'] = './changes.log'; //change log -$conf['uploadtypes'] = 'gif|jpe?g|png|zip|pdf|tar(\.gz)?|tgz'; //regexp of allowed filetypes to upload /* Display Options */ diff --git a/inc/init.php b/inc/init.php index cf86f4718..d3379565c 100644 --- a/inc/init.php +++ b/inc/init.php @@ -93,7 +93,11 @@ function getBaseURL($abs=false){ //if canonical url enabled always return absolute if($conf['canonical']) $abs = true; - $dir = dirname($_SERVER['PHP_SELF']).'/'; + if($conf['basedir']){ + $dir = $conf['basedir']; + }else{ + $dir = dirname($_SERVER['PHP_SELF']).'/'; + } $dir = str_replace('\\','/',$dir); #bugfix for weird WIN behaviour $dir = preg_replace('#//+#','/',$dir); |