Allow HTML in site notice (Bug#1002)

This commit is contained in:
Evan Prodromou 2009-02-04 08:49:42 -05:00
parent 2d063650ef
commit e8d3615b3f

View File

@ -73,7 +73,6 @@ class Action extends HTMLOutputter // lawsuit
parent::__construct($output, $indent); parent::__construct($output, $indent);
} }
/** /**
* For initializing members of the class. * For initializing members of the class.
* *
@ -246,7 +245,6 @@ class Action extends HTMLOutputter // lawsuit
// does nothing by default // does nothing by default
} }
/** /**
* Show body. * Show body.
* *
@ -354,7 +352,7 @@ class Action extends HTMLOutputter // lawsuit
$this->elementEnd('dd'); $this->elementEnd('dd');
$this->elementEnd('dl'); $this->elementEnd('dl');
} }
/** /**
* Show site notice. * Show site notice.
* *
@ -368,7 +366,9 @@ class Action extends HTMLOutputter // lawsuit
$this->elementStart('dl', array('id' => 'site_notice', $this->elementStart('dl', array('id' => 'site_notice',
'class' => 'system_notice')); 'class' => 'system_notice'));
$this->element('dt', null, _('Site notice')); $this->element('dt', null, _('Site notice'));
$this->element('dd', null, $text); $this->elementStart('dd', null);
$this->raw($text);
$this->elementEnd('dd');
$this->elementEnd('dl'); $this->elementEnd('dl');
} }
} }
@ -385,7 +385,7 @@ class Action extends HTMLOutputter // lawsuit
$notice_form = new NoticeForm($this); $notice_form = new NoticeForm($this);
$notice_form->show(); $notice_form->show();
} }
/** /**
* Show anonymous message. * Show anonymous message.
* *
@ -761,7 +761,7 @@ class Action extends HTMLOutputter // lawsuit
/** /**
* Boolean understands english (yes, no, true, false) * Boolean understands english (yes, no, true, false)
* *
* @param string $key query key we're interested in * @param string $key query key we're interested in
* @param string $def default value * @param string $def default value
* *
* @return boolean interprets yes/no strings as boolean * @return boolean interprets yes/no strings as boolean