diff options
| author | Anika Henke <anika@selfthinker.org> | 2014-01-05 16:25:21 +0000 |
|---|---|---|
| committer | Anika Henke <anika@selfthinker.org> | 2014-01-05 16:25:21 +0000 |
| commit | 8491e52805a9aaef90168f1417c6e0806fb7c5d7 (patch) | |
| tree | 536ad50878f0ac6f6815db91f8bcb4819bc092ae /inc/init.php | |
| parent | 6fdd11e032b654dd27de346f7e54231ee043d7ef (diff) | |
| parent | dfaf5f6c54597f81b1a8b777f55b89c93f87a345 (diff) | |
| download | rpg-8491e52805a9aaef90168f1417c6e0806fb7c5d7.tar.gz rpg-8491e52805a9aaef90168f1417c6e0806fb7c5d7.tar.bz2 | |
Merge remote-tracking branch 'origin/master' into extension_manager
Diffstat (limited to 'inc/init.php')
| -rw-r--r-- | inc/init.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/inc/init.php b/inc/init.php index 30eb1b251..a937b934d 100644 --- a/inc/init.php +++ b/inc/init.php @@ -267,10 +267,10 @@ function init_lang($langCode) { $lang = array(); //load the language files - require_once(DOKU_INC.'inc/lang/en/lang.php'); + require(DOKU_INC.'inc/lang/en/lang.php'); if ($langCode && $langCode != 'en') { if (file_exists(DOKU_INC."inc/lang/$langCode/lang.php")) { - require_once(DOKU_INC."inc/lang/$langCode/lang.php"); + require(DOKU_INC."inc/lang/$langCode/lang.php"); } } } @@ -288,7 +288,7 @@ function init_files(){ $fh = @fopen($file,'a'); if($fh){ fclose($fh); - if($conf['fperm']) chmod($file, $conf['fperm']); + if(!empty($conf['fperm'])) chmod($file, $conf['fperm']); }else{ nice_die("$file is not writable. Check your permissions settings!"); } |