Bug 160454 - "Eliminate use of HEAD in "save as"" ((AAv1) cleanup |getFileBaseName()| usages) [p=sgautherie.bz@free.fr (Serge Gautherie) r=Mano sr=Neil a1.9=beltzner]

toolkit/content/contentAreaUtils.js

@@ -337,7 +337,7 @@ function internalSave(aURL, aDocument, aDefaultFileName, aContentDisposition,
       // Create the local directory into which to save associated files.
       filesFolder = file.clone();
 
-      var nameWithoutExtension = filesFolder.leafName.replace(/\.[^.]*$/, "");
+      var nameWithoutExtension = getFileBaseName(filesFolder.leafName);
       var filesFolderLeafName = getStringBundle().formatStringFromName("filesFolder",
                                                                        [nameWithoutExtension],
                                                                        1);
@@ -441,7 +441,7 @@ function initFileInfo(aFI, aURL, aURLCharset, aDocument,
       aFI.fileBaseName = aFI.fileName;
     } else {
       aFI.fileExt = getDefaultExtension(aFI.fileName, aFI.uri, aContentType);
-      aFI.fileBaseName = getFileBaseName(aFI.fileName, aFI.fileExt);
+      aFI.fileBaseName = getFileBaseName(aFI.fileName);
     }
   } catch (e) {
   }
@@ -710,7 +710,7 @@ function getMIMEService()
 }
 
 // Given aFileName, find the fileName without the extension on the end.
-function getFileBaseName(aFileName, aFileExt)
+function getFileBaseName(aFileName)
 {
   // Remove the file extension from aFileName:
   return aFileName.replace(/\.[^.]*$/, "");