Bug 596797 - moz-do-not-send="true" in HTML signature or pasted HTML gets ignored/removed r=bzbarsky a=bzbarsky,branch-blocker
authorEhsan Akhgari <ehsan@mozilla.com>
Tue, 21 Sep 2010 17:28:06 -0400
changeset 54502 f5603541696d923a5908179d648e31d75557c252
parent 54501 4de37c4f3fabc97032c408bbd30de1c11f70a155
child 54503 f404f7ffe6a640483bfb9929d3fa80e32177e4f7
push idunknown
push userunknown
push dateunknown
reviewersbzbarsky, bzbarsky, branch-blocker
bugs596797
milestone2.0b7pre
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
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
content/base/src/nsGkAtomList.h
--- a/content/base/src/nsContentSink.cpp
+++ b/content/base/src/nsContentSink.cpp
@@ -1911,19 +1911,17 @@ nsIAtom** const kDefaultAllowedAttribute
   &nsGkAtoms::loopstart,
 #endif
   &nsGkAtoms::low,
   &nsGkAtoms::max,
   &nsGkAtoms::maxlength,
   &nsGkAtoms::media,
   &nsGkAtoms::method,
   &nsGkAtoms::min,
-#ifdef MOZ_MAIL_NEWS
   &nsGkAtoms::mozdonotsend,
-#endif
   &nsGkAtoms::multiple,
   &nsGkAtoms::name,
   &nsGkAtoms::nohref,
   &nsGkAtoms::noshade,
   &nsGkAtoms::novalidate,
   &nsGkAtoms::nowrap,
   &nsGkAtoms::open,
   &nsGkAtoms::optimum,
--- a/content/base/src/nsGkAtomList.h
+++ b/content/base/src/nsGkAtomList.h
@@ -60,19 +60,17 @@
 //---------------------------------------------------------------------------
 // Generic atoms
 //---------------------------------------------------------------------------
 
 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")
 GK_ATOM(mozgeneratedcontentimage, "_moz_generated_content_image")
 GK_ATOM(_moz_target, "_moz_target")
 GK_ATOM(_moz_type, "_moz-type")
 GK_ATOM(menuactive, "_moz-menuactive")
 GK_ATOM(_poundDefault, "#default")