Allow font-family "protocol" to avoid kses cleaning it. MDL-15963 ; merged from 19_STABLE

diff --git a/lib/weblib.php b/lib/weblib.php
index e1a437330d523714593700342100d7d680b5b3b2..c6e81b9e448331d902f85b71eabb8557e2b933ea 100644 (file)
--- a/lib/weblib.php
+++ b/lib/weblib.php
@@ -100,7 +100,7 @@ $ALLOWED_TAGS =
  * @global string $ALLOWED_PROTOCOLS
  */
 $ALLOWED_PROTOCOLS = array('http', 'https', 'ftp', 'news', 'mailto', 'rtsp', 'teamspeak', 'gopher', 'mms',
-                           'color', 'callto', 'cursor', 'text-align', 'font-size', 'font-weight', 'font-style',
+                           'color', 'callto', 'cursor', 'text-align', 'font-size', 'font-weight', 'font-style', 'font-family',
                            'border', 'margin', 'padding', 'background', 'text-decoration');   // CSS as well to get through kses