Merge 4e8303fae6 into a1ae0fa729

tinyfilemanager.php

@@ -958,7 +958,7 @@ if (!empty($_FILES) && !FM_READONLY) {
 
     $targetPath = $path . $ds;
     if ( is_writable($targetPath) ) {
-        $fullPath = $path . '/' . basename($fullPathInput);
+        $fullPath = $path . '/' . $fullPathInput;
         $folder = substr($fullPath, 0, strrpos($fullPath, "/"));
 
         if (!is_dir($folder)) {
@@ -3054,6 +3054,7 @@ function fm_get_text_mimes()
         'image/svg+xml',
         'message/rfc822',
         'application/json',
+        'application/x-empty',
     );
 }