Bug 321517: A text file in a frame is not properly saved (UI patch 2.0), p=sciguyryan, r=neil, sr/a=bzbarsky

embedding/browser/cocoa/src/SaveHeaderSniffer.mm

@@ -397,7 +397,7 @@ nsresult nsHeaderSniffer::InitiateDownload(nsISupports* inSourceData, nsString&
                         nsIWebBrowserPersist::ENCODE_FLAGS_ABSOLUTE_LINKS |
                         nsIWebBrowserPersist::ENCODE_FLAGS_NOFRAMES_CONTENT;
     }
-    rv = webPersist->SaveDocument(domDoc, destFile, filesFolder, mContentType.get(), encodingFlags, 80);
+    rv = webPersist->SaveDocument(domDoc, destFile, filesFolder, null, encodingFlags, 80);
   }
   
   return rv;

toolkit/content/contentAreaUtils.js

@@ -303,7 +303,7 @@ function internalSave(aURL, aDocument, aDefaultFileName, aContentDisposition,
     source      : source,
     contentType : (!aChosenData && useSaveDocument &&
                    saveAsType == kSaveAsType_Text) ?
-                   "text/plain" : aContentType,
+                   "text/plain" : null,
     target      : fileURL,
     postData    : isDocument ? getPostData() : null,
     bypassCache : aShouldBypassCache

xpfe/communicator/resources/content/contentAreaUtils.js

@@ -396,7 +396,7 @@ function internalSave(aURL, aDocument, aDefaultFileName, aContentDisposition,
     source      : source,
     contentType : (!aChosenData && useSaveDocument &&
                    saveAsType == SAVETYPE_TEXT_ONLY) ?
-                  "text/plain" : aContentType,
+                  "text/plain" : null,
     target      : fileURL,
     postData    : isDocument ? getPostData() : null,
     bypassCache : aShouldBypassCache