From d35aa3a819082dcd65831c0c250a140f67b77090 Mon Sep 17 00:00:00 2001 From: "mozilla@weilbacher.org" Date: Fri, 24 Aug 2007 14:18:40 -0700 Subject: [PATCH] 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 | 2 +- toolkit/content/contentAreaUtils.js | 2 +- xpfe/communicator/resources/content/contentAreaUtils.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/embedding/browser/cocoa/src/SaveHeaderSniffer.mm b/embedding/browser/cocoa/src/SaveHeaderSniffer.mm index 73222739800c..1433dc65f400 100644 --- a/embedding/browser/cocoa/src/SaveHeaderSniffer.mm +++ b/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; diff --git a/toolkit/content/contentAreaUtils.js b/toolkit/content/contentAreaUtils.js index c3b5035d75c2..d767f97e2579 100644 --- a/toolkit/content/contentAreaUtils.js +++ b/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 diff --git a/xpfe/communicator/resources/content/contentAreaUtils.js b/xpfe/communicator/resources/content/contentAreaUtils.js index 0b6f27bfce4f..1a86622925a2 100644 --- a/xpfe/communicator/resources/content/contentAreaUtils.js +++ b/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