Merged from Stable (fix for color fonts)

diff --git a/lib/weblib.php b/lib/weblib.php
index 600fe1df8bb3db01ccf03edda4e0a0687a20c580..89ac7bf4619c3b2c01f7bba9cacf738d113935e7 100644 (file)
--- a/lib/weblib.php
+++ b/lib/weblib.php
@@ -790,7 +790,7 @@ function cleanAttributes2($htmlTag){
     $elem = $matches[2];    //the element name
     $attrlist = $matches[3]; // the list of attributes as a string
 
-    $allowed_protocols = array('http', 'https', 'ftp', 'news', 'mailto', 'teamspeak', 'gopher');
+    $allowed_protocols = array('http', 'https', 'ftp', 'news', 'mailto', 'teamspeak', 'gopher', 'color');
     $attrArray =  kses_hair($attrlist, $allowed_protocols) ;
 
     $attStr = '';