diff options
| author | Anika Henke <anika@selfthinker.org> | 2012-05-27 12:33:51 +0100 |
|---|---|---|
| committer | Anika Henke <anika@selfthinker.org> | 2012-05-27 12:33:51 +0100 |
| commit | 7f086b678f95509d080486e46f683595be591727 (patch) | |
| tree | 460f793de0cbfaaf0bd5e2038702084f531ee0f6 /inc | |
| parent | 6b9c156c2d804458adf7d057c5c021d4c4658a9d (diff) | |
| download | rpg-7f086b678f95509d080486e46f683595be591727.tar.gz rpg-7f086b678f95509d080486e46f683595be591727.tar.bz2 | |
improved earlier change for paths error messages to not produce any notices
Diffstat (limited to 'inc')
| -rw-r--r-- | inc/init.php | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/inc/init.php b/inc/init.php index 923bda352..403fbe4ab 100644 --- a/inc/init.php +++ b/inc/init.php @@ -233,10 +233,8 @@ function init_paths(){ 'lockdir' => 'locks', 'tmpdir' => 'tmp'); - foreach($paths as $c => $p){ - $path = $conf[$c]; - if(empty($path)) - $path = $conf['savedir'].'/'.$p; + foreach($paths as $c => $p) { + $path = empty($conf[$c]) ? $conf['savedir'].'/'.$p : $conf[$c]; $conf[$c] = init_path($path); if(empty($conf[$c])) 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 * * 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> */ |