MDL-58548 lib: Update htmlpurifier to the latest version.

2017-10-02 08:19:40 +08:00
parent 23ab0d7788
commit 247ff6bc2b
30 changed files with 575 additions and 115 deletions
@@ -86,7 +86,13 @@ abstract class HTMLPurifier_AttrDef
     */
    protected function mungeRgb($string)
    {
-        return preg_replace('/rgb\((\d+)\s*,\s*(\d+)\s*,\s*(\d+)\)/', 'rgb(\1,\2,\3)', $string);
+        $p = '\s*(\d+(\.\d+)?([%]?))\s*';
+
+        if (preg_match('/(rgba|hsla)\(/', $string)) {
+            return preg_replace('/(rgba|hsla)\('.$p.','.$p.','.$p.','.$p.'\)/', '\1(\2,\5,\8,\11)', $string);
+        }
+
+        return preg_replace('/(rgb|hsl)\('.$p.','.$p.','.$p.'\)/', '\1(\2,\5,\8)', $string);
    }

    /**