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

Unifying HTML stripping functions to common_strip_html

Browse Source
This commit is contained in:
Mikael Nordfeldth
2014-07-14 13:52:23 +02:00
parent e0a10f775f
commit ae62b91940
9 changed files with 23 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
plugins/TinyMCE/TinyMCEPlugin.php
View File

@@ -104,17 +104,6 @@ class TinyMCEPlugin extends Plugin
return htmLawed($raw, $config);
}
/**
* Strip HTML to plaintext string
*
* @param string $html HTML
* @return string plaintext, single line
*/
private function stripHtml($html)
{
return str_replace("\n", " ", html_entity_decode(strip_tags($html), ENT_QUOTES, 'UTF-8'));
}
/**
* Hook for new-notice form processing to take our HTML goodies;
* won't affect API posting etc.
@@ -130,7 +119,7 @@ class TinyMCEPlugin extends Plugin
if ($action->arg('richedit') && $this->isAllowedRichEdit()) {
$html = $this->sanitizeHtml($content);
$options['rendered'] = $html;
$content = $this->stripHtml($html);
$content = common_strip_html($html);
}
return true;
}