From 5da68ea6f2fe4f2ce7dc43c9ee09f32c822c5ad5 Mon Sep 17 00:00:00 2001 From: "aaronr%us.ibm.com" Date: Fri, 18 May 2007 19:02:16 +0000 Subject: [PATCH] backing out patch for bug 376371 to help pinpoint mochitest issue git-svn-id: svn://10.0.0.236/trunk@226619 18797224-902f-48f8-a5cc-f745e15eee43 --- .../extensions/xforms/nsXFormsSubmissionElement.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/mozilla/extensions/xforms/nsXFormsSubmissionElement.cpp b/mozilla/extensions/xforms/nsXFormsSubmissionElement.cpp index 9144b21acc6..2e312775bdf 100644 --- a/mozilla/extensions/xforms/nsXFormsSubmissionElement.cpp +++ b/mozilla/extensions/xforms/nsXFormsSubmissionElement.cpp @@ -681,7 +681,8 @@ nsXFormsSubmissionElement::Submit() NS_ENSURE_STATE(mFormat != 0); nsCOMPtr stream; - nsCAutoString uri, contentType; + nsCAutoString contentType; + nsCAutoString uri; GetSubmissionURI(uri); rv = SerializeData(submissionDoc, uri, getter_AddRefs(stream), contentType); @@ -771,9 +772,6 @@ nsXFormsSubmissionElement::GetSubmissionURI(nsACString& aURI) NS_ENSURE_SUCCESS(rv, rv); if (xpRes) { - // Truncate uri so GetStringValue replaces the contents with the - // xpath result rather than appending to it. - uri.Truncate(); rv = xpRes->GetStringValue(uri); NS_ENSURE_SUCCESS(rv, rv); } @@ -796,8 +794,8 @@ nsXFormsSubmissionElement::GetSubmissionURI(nsACString& aURI) if (uri.IsEmpty()) nsXFormsUtils::ReportError(NS_LITERAL_STRING("warnSubmitURI"), mElement, nsIScriptError::warningFlag); - - CopyUTF16toUTF8(uri, aURI); + else + CopyUTF16toUTF8(uri, aURI); return rv; }