Changed: use whitelist from tiny

joomla · Apr 22, 2016 · dbb8f53 · dbb8f53
1 parent 4df0f9d
commit dbb8f53
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/plugins/editors/tinymce/tinymce.php b/plugins/editors/tinymce/tinymce.php
@@ -298,22 +298,22 @@ public function onDisplay($name, $content, $width, $height, $col, $row, $buttons
 				// Use filters from com_config
 				$filter = $this->getGlobalFilters();
 
-				$tagBlacklist  = !empty($filter->tagBlacklist) ? $filter->tagBlacklist : array();
+				$tagBlacklist	= !empty($filter->tagBlacklist) ? $filter->tagBlacklist : array();
 				$attrBlacklist = !empty($filter->attrBlacklist) ? $filter->attrBlacklist : array();
-				$tagArray      = !empty($filter->tagArray) ? $filter->tagArray : array();
-				$attrArray     = !empty($filter->attrArray) ? $filter->attrArray : array();
+				$tagArray		= !empty($filter->tagArray) ? $filter->tagArray : array();
+				$attrArray		= !empty($filter->attrArray) ? $filter->attrArray : array();
 
 				$invalid_elements  = implode(',', array_merge($tagBlacklist, $attrBlacklist, $tagArray, $attrArray));
-				$extended_elements = '';
-				$valid_elements    = '';
 			}
 			else
 			{
 				// Use filters from TinyMCE params
 				$invalid_elements  = $this->params->get('invalid_elements', 'script,applet,iframe');
-				$extended_elements = $this->params->get('extended_elements', '');
-				$valid_elements    = $this->params->get('valid_elements', '');
 			}
+
+			// Valid elements from TinyMCE
+			$extended_elements = $this->params->get('extended_elements', '');
+			$valid_elements		= $this->params->get('valid_elements', '');
 
 			// Advanced Options
 			$access = JFactory::getUser()->getAuthorisedViewLevels();