diff options
| author | Andreas Gohr <andi@splitbrain.org> | 2012-07-28 10:40:48 +0200 |
|---|---|---|
| committer | Andreas Gohr <andi@splitbrain.org> | 2012-07-28 10:40:48 +0200 |
| commit | 3009a773c06e6e5d731c42b12ad82272f9706f03 (patch) | |
| tree | 4e15ab478a04177de73ad9601842eee5c1be2162 /lib | |
| parent | f393a4eb51a5f8ed0e64f09f76cbafe57d7dcb57 (diff) | |
| download | rpg-3009a773c06e6e5d731c42b12ad82272f9706f03.tar.gz rpg-3009a773c06e6e5d731c42b12ad82272f9706f03.tar.bz2 | |
replaced use of basename() with utf8_basename() FS#2015
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/exe/fetch.php | 4 | ||||
| -rw-r--r-- | lib/exe/js.php | 2 | ||||
| -rw-r--r-- | lib/plugins/plugin/classes/ap_download.class.php | 8 |
3 files changed, 7 insertions, 7 deletions
diff --git a/lib/exe/fetch.php b/lib/exe/fetch.php index 60843460e..150812b55 100644 --- a/lib/exe/fetch.php +++ b/lib/exe/fetch.php @@ -122,9 +122,9 @@ function sendFile($file,$mime,$dl,$cache){ //download or display? if($dl){ - header('Content-Disposition: attachment; filename="'.basename($file).'";'); + header('Content-Disposition: attachment; filename="'.utf8_basename($file).'";'); }else{ - header('Content-Disposition: inline; filename="'.basename($file).'";'); + header('Content-Disposition: inline; filename="'.utf8_basename($file).'";'); } //use x-sendfile header to pass the delivery to compatible webservers diff --git a/lib/exe/js.php b/lib/exe/js.php index 7c54f3e2e..f84c07709 100644 --- a/lib/exe/js.php +++ b/lib/exe/js.php @@ -143,7 +143,7 @@ function js_load($file){ // is it a include_once? if($match[1]){ - $base = basename($ifile); + $base = utf8_basename($ifile); if($loaded[$base]) continue; $loaded[$base] = true; } diff --git a/lib/plugins/plugin/classes/ap_download.class.php b/lib/plugins/plugin/classes/ap_download.class.php index b2571f632..2d5ead400 100644 --- a/lib/plugins/plugin/classes/ap_download.class.php +++ b/lib/plugins/plugin/classes/ap_download.class.php @@ -155,16 +155,16 @@ class ap_download extends ap_manage { $info['type'] = 'plugin'; $info['tmp'] = "$base/$dir"; $conf = confToHash("$base/$dir/$f"); - $info['base'] = basename($conf['base']); - if(!$info['base']) $info['base'] = basename("$base/$dir"); + $info['base'] = utf8_basename($conf['base']); + if(!$info['base']) $info['base'] = utf8_basename("$base/$dir"); $result['new'][] = $info; }elseif($f == 'template.info.txt'){ $info = array(); $info['type'] = 'template'; $info['tmp'] = "$base/$dir"; $conf = confToHash("$base/$dir/$f"); - $info['base'] = basename($conf['base']); - if(!$info['base']) $info['base'] = basename("$base/$dir"); + $info['base'] = utf8_basename($conf['base']); + if(!$info['base']) $info['base'] = utf8_basename("$base/$dir"); $result['new'][] = $info; } }else{ |