GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Notice getRendered() can now be called on uninserted notices

Browse Source
This commit is contained in:
Mikael Nordfeldth 2016-02-25 15:48:37 +01:00
parent 67aff528f5
commit 6336248d71
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
classes/Notice.php
View File

@ -260,7 +260,8 @@ class Notice extends Managed_DataObject
public function getRendered() public function getRendered()
{ {
if (is_null($this->rendered) || $this->rendered === '') { // we test $this->id because if it's not inserted yet, we can't update the field
if (!empty($this->id) && (is_null($this->rendered) || $this->rendered === '')) {
// update to include rendered content on-the-fly, so we don't have to have a fix-up script in upgrade.php // update to include rendered content on-the-fly, so we don't have to have a fix-up script in upgrade.php
common_debug('Rendering notice '.$this->getID().' as it had no rendered HTML content.'); common_debug('Rendering notice '.$this->getID().' as it had no rendered HTML content.');
$orig = clone($this); $orig = clone($this);
@ -854,8 +855,7 @@ class Notice extends Managed_DataObject
} }
// Strip out any bad HTML // Strip out any bad HTML
$stored->rendered = common_purify($content); $stored->rendered = common_purify($content);
// yeah, just don't use getRendered() here since it's not inserted yet ;) $stored->content = common_strip_html($stored->getRendered(), true, true);
$stored->content = common_strip_html($stored->rendered);
if (trim($stored->content) === '') { if (trim($stored->content) === '') {
// TRANS: Error message when the plain text content of a notice has zero length. // TRANS: Error message when the plain text content of a notice has zero length.
throw new ClientException(_('Empty notice content, will not save this.')); throw new ClientException(_('Empty notice content, will not save this.'));