2 files changed, 4 insertions, 2 deletions
diff --git a/lib/exe/ajax.php b/lib/exe/ajax.php
index f8d62cb57..8edd559d6 100644
--- a/lib/exe/ajax.php
+++ b/lib/exe/ajax.php
@@ -257,7 +257,7 @@ function ajax_mediaupload(){
         $id = $_GET['qqfile'];
     }
 
-    $id = cleanID($id, false, true);
+    $id = cleanID($id);
 
     $NS = $_REQUEST['ns'];
     $ns = $NS.':'.getNS($id);
diff --git a/lib/scripts/fileuploaderextended.js b/lib/scripts/fileuploaderextended.js
index f92bdbc49..4abd63bef 100644
--- a/lib/scripts/fileuploaderextended.js
+++ b/lib/scripts/fileuploaderextended.js
@@ -55,9 +55,11 @@ qq.extend(qq.FileUploader.prototype, {
         qq.setText(fileElement, fileName);
         this._find(item, 'size').style.display = 'none';
 
+        // name suggestion (simplified cleanID)
         var nameElement = this._find(item, 'nameInput');
         fileName = fileName.toLowerCase();
-        fileName = fileName.replace(/([^a-z0-9_\.\-]+)/g, '_');
+        fileName = fileName.replace(/([ !"#$%&\'()+,\/;<=>?@[\]^`{|}~:]+)/g, '_');
+        fileName = fileName.replace(/^_+/,'');
         nameElement.value = fileName;
         nameElement.id = 'mediamanager__upload_item'+id;