Item12952: Broadcast message expands recursively

The FOSWIKI_BROADCAST was working fine,  but if the regular BROADCAST
was set, the template expanded recursively resulting in 10 or so nested
spans.

core/templates/foswiki.tmpl

@@ -91,9 +91,10 @@ JQUERYPLUGIN is not a hard requirement, but it must sort earlier.
 }%%TMPL:DEF{"bodyend"}%</div>
 </body></html>%TMPL:END%%{
 ---------------------------------------------------
-}%%TMPL:DEF{"broadcastmessage"}%<span class="foswikiAlert">%FOSWIKI_BROADCAST%</span>%IF{"defined BROADCASTMESSAGE and $BROADCASTMESSAGE != ''" then="$percntTMPL:P{$quotbroadcastmessage:contents$quot}$percnt"}%%TMPL:END%%{
+}%%TMPL:DEF{"broadcastmessage"}%%IF{"defined FOSWIKI_BROADCAST and $FOSWIKI_BROADCAST != ''" then="$percntTMPL:P{$quotbroadcastmessage:system$quot}$percnt"}%%IF{"defined BROADCASTMESSAGE and $BROADCASTMESSAGE != ''" then="$percntTMPL:P{$quotbroadcastmessage:contents$quot}$percnt"}%%TMPL:END%%{
 ---------------------------------------------------
-}%%TMPL:DEF{"broadcastmessage:contents"}%<div class="foswikiBroadcastMessage"> %TMPL:P{"broadcastmessage"}% </div>%TMPL:END%%{
+}%%TMPL:DEF{"broadcastmessage:contents"}%<div class="foswikiBroadcastMessage"> %BROADCASTMESSAGE% </div>%TMPL:END%%{
+}%%TMPL:DEF{"broadcastmessage:system"}%<div class="foswikiAlert"> %FOSWIKI_BROADCAST% </div>%TMPL:END%%{
 ---------------------------------------------------
 }%%TMPL:DEF{"attachments"}%%TMPL:END%%{
 ---------------------------------------------------