Changeset 3219 for trunk/php/lib/MTUtil.php

Timestamp:

12/03/08 07:58:25 (12 months ago)

Author:

fumiakiy

Message:

Merging the latest of fireball branch to trunk. svn merge -r3095:3215 http://code.sixapart.com/svn/movabletype/branches/fireball . (two conflicts resolved; MT.pm, mt.php and mt-check.cgi merged manually.)

Files:

• trunk/php/lib/MTUtil.php (modified) (1 diff)

trunk/php/lib/MTUtil.php

@@ -1530 +1530 @@
             if ($filter == '__default__') {
                 $filter = 'convert_breaks';
+            } elseif ($filter == '__sanitize__') {
+                $filter = 'sanitize';
             }
             if ($filter == 'convert_breaks') {