Changeset 3082 for trunk/php/lib/sanitize_lib.php

Timestamp:

10/03/08 01:07:01 (14 months ago)

Author:

bchoate

Message:

Merging fireball branch changes to-date to trunk: svn merge -r2974:3081 http://code.sixapart.com/svn/movabletype/branches/fireball .

Files:

• trunk/php/lib/sanitize_lib.php (modified) (2 diffs, 1 prop)

trunk/php/lib/sanitize_lib.php

@@ -38 +38 @@
                 $inside = preg_replace('!/?>$!', '', $inside);
                 $attrs = '';
-                if (preg_match_all('/\s*(\w+)\s*=(?:([\'"])(.*?)\2|([^\s]+))\s*/', $inside, $matches, PREG_SET_ORDER)) {
+                if (preg_match_all('/\s*(\w+)\s*=(?:([\'"])(.*?)\2|([^\s]+))\s*/s', $inside, $matches, PREG_SET_ORDER)) {
                     foreach ($matches as $match) {
                         $attr = strtolower($match[1]);
@@ -55 +55 @@
                                 $dec_val = preg_replace('/&#0*58(?:=;|[^0-9])/', ':', $dec_val);
                                 $dec_val = preg_replace('/&#x0*3[Aa](?:=;|[^a-fA-F0-9])/', ':', $dec_val);
-                                if (preg_match('/^(.+?):/', $dec_val, $proto_match)) {
+                                if (preg_match('/^([\s\S]+?):/', $dec_val, $proto_match)) {
                                     $proto = $proto_match[1];
                                     if (preg_match('/[\r\n\t]/', $proto)) {