[svn r21411] FS#306 - The global initialization script: Commenting a duplicate code for initialization of the global variable $charset, to be removed. Offtopic: A minor correction within the table that serves the function add_ext_on_mime() - for 'text/html' MIME type the '.html' extension will be assigned instead of '.htm'.

main/inc/global.inc.php

@@ -563,12 +563,15 @@ if (is_array($language_files)) {
 	}
 }
 
+/* 
+// TODO: This is a duplicate initialization of the global variable $charset, see above. To be removed.
 //load the charset param after langs because the $charset variable in 
 //trad4all.inc.php might have set it and we don't want that
 $charset = api_get_setting('platform_charset');
 if (empty($charset)) {
 	$charset = 'ISO-8859-15';
 }
+*/
 
 //Update of the logout_date field in the table track_e_login (needed for the calculation of the total connection time)
 

main/inc/lib/fileUpload.lib.php

@@ -664,7 +664,7 @@ function add_ext_on_mime($fileName,$fileType)
 		$mimeType[] = "application/x-tar";              $extension[] =".tar";
 		$mimeType[] = "application/zip";                $extension[] =".zip";
 		$mimeType[] = "application/x-tar";              $extension[] =".tar";
-		$mimeType[] = "text/html";                      $extension[] =".htm";
+		$mimeType[] = "text/html";                      $extension[] =".html";
 		$mimeType[] = "text/plain";                     $extension[] =".txt";
 		$mimeType[] = "text/rtf";                       $extension[] =".rtf";
 		$mimeType[] = "img/gif";                        $extension[] =".gif";