Skip to content

Commit

Permalink
Rename filter loader method and make it static + cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
chmst committed Apr 19, 2016
1 parent 908bcb0 commit 2c8043e
Showing 1 changed file with 2 additions and 5 deletions.
7 changes: 2 additions & 5 deletions plugins/editors/tinymce/tinymce.php
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@ public function onDisplay($name, $content, $width, $height, $col, $row, $buttons
if ($this->params->get('use_config_textfilters', 0))
{
// Use filters from com_config
$filter = self::filterText(true);
$filter = self::getGlobalFilters();

$tagBlacklist = !empty($filter->tagBlacklist) ? $filter->tagBlacklist : array();
$attrBlacklist = !empty($filter->attrBlacklist) ? $filter->attrBlacklist : array();
Expand Down Expand Up @@ -1150,11 +1150,8 @@ private function tinyButtons($name, $excluded)
*
* @since 2.5
*/
public static function filterText($text)
protected static function getGlobalFilters()
{
// Punyencoding utf8 email addresses
$text = JFilterInput::getInstance()->emailToPunycode($text);

// Filter settings
$config = JComponentHelper::getParams('com_config');
$user = JFactory::getUser();
Expand Down

0 comments on commit 2c8043e

Please sign in to comment.