Upgrade smarty from 2.6.18 to 2.6.30

[contagged] / inc / smarty / plugins / function.cycle.php

diff --git a/inc/smarty/plugins/function.cycle.php b/inc/smarty/plugins/function.cycle.php
index fe78bb87da02a617af79964a02c944543c68c27b..80378b7f96c1ad70be5ff1b17018f9ea0c9cde2b 100644 (file)
--- a/inc/smarty/plugins/function.cycle.php
+++ b/inc/smarty/plugins/function.cycle.php
@@ -63,7 +63,11 @@ function smarty_function_cycle($params, &$smarty)
         $cycle_vars[$name]['values'] = $params['values'];
     }
 
-    $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'])) {
         $cycle_array = $cycle_vars[$name]['values'];