From 842eb2af73eeb64ce08128d3c7c40fd82377c28f Mon Sep 17 00:00:00 2001 From: Ehsan Akhgari Date: Tue, 21 Sep 2010 17:28:06 -0400 Subject: [PATCH] Bug 596797 - moz-do-not-send="true" in HTML signature or pasted HTML gets ignored/removed r=bzbarsky a=bzbarsky,branch-blocker --- content/base/src/nsContentSink.cpp | 2 -- content/base/src/nsGkAtomList.h | 4 +--- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/content/base/src/nsContentSink.cpp b/content/base/src/nsContentSink.cpp index ecec06f2466..cc7b9cc62f9 100644 --- a/content/base/src/nsContentSink.cpp +++ b/content/base/src/nsContentSink.cpp @@ -1916,9 +1916,7 @@ nsIAtom** const kDefaultAllowedAttributes [] = { &nsGkAtoms::media, &nsGkAtoms::method, &nsGkAtoms::min, -#ifdef MOZ_MAIL_NEWS &nsGkAtoms::mozdonotsend, -#endif &nsGkAtoms::multiple, &nsGkAtoms::name, &nsGkAtoms::nohref, diff --git a/content/base/src/nsGkAtomList.h b/content/base/src/nsGkAtomList.h index a504e3d78f2..9a03262a093 100644 --- a/content/base/src/nsGkAtomList.h +++ b/content/base/src/nsGkAtomList.h @@ -65,9 +65,7 @@ GK_ATOM(_empty, "") GK_ATOM(moz, "_moz") GK_ATOM(moztype, "_moz-type") GK_ATOM(mozdirty, "_moz_dirty") -#ifdef MOZ_MAIL_NEWS -GK_ATOM(mozdonotsend, "_moz_do_not_send") -#endif +GK_ATOM(mozdonotsend, "moz-do-not-send") GK_ATOM(mozeditorbogusnode, "_moz_editor_bogus_node") GK_ATOM(mozgeneratedcontentbefore, "_moz_generated_content_before") GK_ATOM(mozgeneratedcontentafter, "_moz_generated_content_after")