improved earlier change for paths error messages to not produce any notices
This commit is contained in:
parent
6b9c156c2d
commit
7f086b678f
|
@ -233,10 +233,8 @@ function init_paths(){
|
||||||
'lockdir' => 'locks',
|
'lockdir' => 'locks',
|
||||||
'tmpdir' => 'tmp');
|
'tmpdir' => 'tmp');
|
||||||
|
|
||||||
foreach($paths as $c => $p){
|
foreach($paths as $c => $p) {
|
||||||
$path = $conf[$c];
|
$path = empty($conf[$c]) ? $conf['savedir'].'/'.$p : $conf[$c];
|
||||||
if(empty($path))
|
|
||||||
$path = $conf['savedir'].'/'.$p;
|
|
||||||
$conf[$c] = init_path($path);
|
$conf[$c] = init_path($path);
|
||||||
if(empty($conf[$c]))
|
if(empty($conf[$c]))
|
||||||
nice_die("The $c ('$p') at $path is not found, isn't accessible or writable.
|
nice_die("The $c ('$p') at $path is not found, isn't accessible or writable.
|
||||||
|
@ -310,7 +308,7 @@ function init_files(){
|
||||||
* Returns absolute path
|
* Returns absolute path
|
||||||
*
|
*
|
||||||
* This tries the given path first, then checks in DOKU_INC.
|
* This tries the given path first, then checks in DOKU_INC.
|
||||||
* Check for accessability on directories as well.
|
* Check for accessibility on directories as well.
|
||||||
*
|
*
|
||||||
* @author Andreas Gohr <andi@splitbrain.org>
|
* @author Andreas Gohr <andi@splitbrain.org>
|
||||||
*/
|
*/
|
||||||
|
|
Loading…
Reference in New Issue