diff options
| author | Anika Henke <anika@selfthinker.org> | 2012-06-29 17:51:09 +0100 |
|---|---|---|
| committer | Anika Henke <anika@selfthinker.org> | 2012-06-29 17:51:09 +0100 |
| commit | 0c06a181819249c6a4a2a6c60e13f739df1f2253 (patch) | |
| tree | 859377c572d0acbfc520b02304ef515bf3aebbe0 /inc/pageutils.php | |
| parent | ef7e36e4fd2a168977754f0aac1d855fb651f104 (diff) | |
| parent | 5d0aaf958325f500ce69cfb79e69eb0d8f83fdeb (diff) | |
| download | rpg-0c06a181819249c6a4a2a6c60e13f739df1f2253.tar.gz rpg-0c06a181819249c6a4a2a6c60e13f739df1f2253.tar.bz2 | |
Merge branch 'master' of github.com:splitbrain/dokuwiki into frontend_improvements
Conflicts:
lib/tpl/dokuwiki/css/basic.css
Diffstat (limited to 'inc/pageutils.php')
| -rw-r--r-- | inc/pageutils.php | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/inc/pageutils.php b/inc/pageutils.php index db00258e2..c94d14624 100644 --- a/inc/pageutils.php +++ b/inc/pageutils.php @@ -355,19 +355,21 @@ function mediaFN($id, $rev=''){ } /** - * Returns the full filepath to a localized textfile if local + * Returns the full filepath to a localized file if local * version isn't found the english one is returned * + * @param string $id The id of the local file + * @param string $ext The file extension (usually txt) * @author Andreas Gohr <andi@splitbrain.org> */ -function localeFN($id){ +function localeFN($id,$ext='txt'){ global $conf; - $file = DOKU_CONF.'/lang/'.$conf['lang'].'/'.$id.'.txt'; + $file = DOKU_CONF.'/lang/'.$conf['lang'].'/'.$id.'.'.$ext; if(!@file_exists($file)){ - $file = DOKU_INC.'inc/lang/'.$conf['lang'].'/'.$id.'.txt'; + $file = DOKU_INC.'inc/lang/'.$conf['lang'].'/'.$id.'.'.$ext; if(!@file_exists($file)){ //fall back to english - $file = DOKU_INC.'inc/lang/en/'.$id.'.txt'; + $file = DOKU_INC.'inc/lang/en/'.$id.'.'.$ext; } } return $file; |