2 files changed, 3 insertions, 3 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;
         }