diff options
| author | Anika Henke <anika@selfthinker.org> | 2013-11-02 13:10:14 +0000 |
|---|---|---|
| committer | Anika Henke <anika@selfthinker.org> | 2013-11-02 13:10:14 +0000 |
| commit | c5393ecb1aa570830d21e9dc95b4c21cd9aa9c01 (patch) | |
| tree | 96e8dc34468a325596a5f94c85e38374fbc4b9ba /inc/init.php | |
| parent | 71c1143e8785954ea00a62aeb755ca7d8fa47e56 (diff) | |
| parent | 38d74b12176722ce52dc1905c13816a78a2551ee (diff) | |
| download | rpg-c5393ecb1aa570830d21e9dc95b4c21cd9aa9c01.tar.gz rpg-c5393ecb1aa570830d21e9dc95b4c21cd9aa9c01.tar.bz2 | |
Merge remote-tracking branch 'origin/master' into video-audio
Conflicts:
inc/parser/xhtml.php
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!"); } |