Changeset 2587

Timestamp:

06/17/08 04:13:08 (20 months ago)

Author:

takayama

Message:

Fixed BugId:80186
* Changed to be able to apply multiple filters

Location:

branches/release-40/php/lib

Files:

• MTUtil.php (modified) (1 diff)
• modifier.filters.php (modified) (1 diff)

branches/release-40/php/lib/MTUtil.php

@@ -1506 +1506 @@
 }
 
-function apply_text_filter ($ctx, $text, $filter) {
-  if ($text == '' || $filter == '') return $text;
-
-    if ($filter == 'convert_breaks') {
-        $text = html_text_transform($text);
-    } elseif ($ctx->load_modifier($filter)) {
-        $mod = 'smarty_modifier_'.$filter;
-        $text = $mod($text);
+function apply_text_filter ($ctx, $text, $filters) {
+    if ($text == '' || $filters == '') return $text;
+
+    $f = preg_split('/\s*,\s*/', $filters);
+    if (is_array($f) && count($f) > 0) {
+        foreach ($f as $filter) {
+            if ($filter == '__default__') {
+                $filter = 'convert_breaks';
+            }
+            if ($filter == 'convert_breaks') {
+                $text = html_text_transform($text);
+            } elseif ($ctx->load_modifier($filter)) {
+                $mod = 'smarty_modifier_'.$filter;
+                $text = $mod($text);
+            }
+        }
     }
 

branches/release-40/php/lib/modifier.filters.php

@@ -8 +8 @@
 function smarty_modifier_filters($text,$filters) {
     // status: complete
-    $f = preg_split('/\s*,\s*/', $filters);
     global $mt;
     $ctx =& $mt->context();
-    if (is_array($f) && count($f) > 0) {
-        foreach ($f as $filter) {
-            if ($filter == '__default__') {
-                $filter = 'convert_breaks';
-            }
-            require_once 'MTUtil.php';
-            $text = apply_text_filter($ctx, $text, $filter);
-        }
-    }
+    require_once 'MTUtil.php';
+    $text = apply_text_filter($ctx, $text, $filters);
+
     return $text;
 }