diff --git a/main/document/document.php b/main/document/document.php
index ad32a5b322..b43a4bcfb5 100644
--- a/main/document/document.php
+++ b/main/document/document.php
@@ -1,4 +1,4 @@
-<?php // $Id: document.php 17868 2009-01-20 17:26:33Z cvargas1 $
+<?php // $Id: document.php 18077 2009-01-29 17:19:10Z cvargas1 $
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
@@ -500,6 +500,9 @@ if($is_allowed_to_edit || $group_member_with_upload_rights) // TEACHER ONLY
 		{
 			$added_slash = ($curdirpath=='/')?'':'/';
 			$dir_name = $curdirpath.$added_slash.replace_dangerous_char($post_dir_name);
+			$clean_val=disable_dangerous_file($dir_name);
+			$clean_val=replace_accents($dir_name);
+			$dir_name=$clean_val;
 			$dir_check=$base_work_dir.''.$dir_name;
 			
 			if(!is_dir($dir_check))
diff --git a/main/inc/lib/fileUpload.lib.php b/main/inc/lib/fileUpload.lib.php
index 5071e79305..c8d5de75dc 100644
--- a/main/inc/lib/fileUpload.lib.php
+++ b/main/inc/lib/fileUpload.lib.php
@@ -86,8 +86,10 @@ function api_replace_parameter($upload_path, $buffer, $param_name="src")
  * @return	string	The escaped string, not absolutely correct but satisfying
  */
 function replace_accents($string){
-	$string = htmlentities($string,ENT_QUOTES);
-	return preg_replace("/&([a-z])[a-z]+;/i","$1",$string);
+	global $charset;
+	$string = htmlentities($string,ENT_QUOTES,$charset);
+	$res = preg_replace("/&([a-z])[a-z]+;/i","$1",$string);
+	return $res;
 }
 
 //------------------------------------------------------------------------------