Ticket #12394: kses.php.diff

kses.php

@@ -538 +538 @@
         # Is there a closing XHTML slash at the end of the attributes?
 
         $xhtml_slash = '';
-        if (preg_match('%\s/\s*$%', $attr))
+        if (preg_match('%\s*/\s*$%', $attr))
                 $xhtml_slash = ' /';
 
         # Are any attributes allowed at all for this element?
@@ -664 +664 @@
 
                         case 2 : # attribute value, a URL after href= for instance
 
-                                if (preg_match('/^"([^"]*)"(\s+|$)/', $attr, $match))
+                                if (preg_match('%^"([^"]*)"(\s+|/?$)%', $attr, $match))
                                         # "value"
                                         {
                                         $thisval = $match[1];
@@ -680 +680 @@
                                         break;
                                 }
 
-                                if (preg_match("/^'([^']*)'(\s+|$)/", $attr, $match))
+                                if (preg_match("%^'([^']*)'(\s+|/?$)%", $attr, $match))
                                         # 'value'
                                         {
                                         $thisval = $match[1];
@@ -696 +696 @@
                                         break;
                                 }
 
-                                if (preg_match("%^([^\s\"']+)(\s+|$)%", $attr, $match))
+                                if (preg_match("%^([^\s\"']+)(\s+|/?$)%", $attr, $match))
                                         # value
                                         {
                                         $thisval = $match[1];