Changeset 23000 for branches/version-2_13-dev/data/module/Smarty/libs/plugins

Timestamp:

2013/07/23 10:39:42 (13 years ago)

Author:

Seasoft

Message:

#2275 (PHP5.5対応)

• Smarty 2.6.26 -> 2.6.27 (厳密にはPHP5.3対応か)

Location:

branches/version-2_13-dev/data/module/Smarty/libs/plugins

Files:

• function.cycle.php (modified) (1 diff)
• function.fetch.php (modified) (1 diff)
• function.math.php (modified) (1 diff)

branches/version-2_13-dev/data/module/Smarty/libs/plugins/function.cycle.php

@@ -64 +64 @@
     }
 
-    $cycle_vars[$name]['delimiter'] = (isset($params['delimiter'])) ? $params['delimiter'] : ',';
+    if (isset($params['delimiter'])) {
+        $cycle_vars[$name]['delimiter'] = $params['delimiter'];
+    } elseif (!isset($cycle_vars[$name]['delimiter'])) {
+        $cycle_vars[$name]['delimiter'] = ',';       
+    }
     
     if(is_array($cycle_vars[$name]['values'])) {

branches/version-2_13-dev/data/module/Smarty/libs/plugins/function.fetch.php

@@ -182 +182 @@
                     }
                     fclose($fp);
-                    $csplit = split("\r\n\r\n",$content,2);
+                    $csplit = preg_split("!\r\n\r\n!",$content,2);
 
                     $content = $csplit[1];
 
                     if(!empty($params['assign_headers'])) {
-                        $smarty->assign($params['assign_headers'],split("\r\n",$csplit[0]));
+                        $smarty->assign($params['assign_headers'],preg_split("!\r\n!",$csplit[0]));
                     }
                 }

branches/version-2_13-dev/data/module/Smarty/libs/plugins/function.math.php

@@ -38 +38 @@
 
     // match all vars in equation, make sure all are passed
-    preg_match_all("!(?:0x[a-fA-F0-9]+)|([a-zA-Z][a-zA-Z0-9_]+)!",$equation, $match);
+    preg_match_all("!(?:0x[a-fA-F0-9]+)|([a-zA-Z][a-zA-Z0-9_]*)!",$equation, $match);
     $allowed_funcs = array('int','abs','ceil','cos','exp','floor','log','log10',
                            'max','min','pi','pow','rand','round','sin','sqrt','srand','tan');