Merge pull request civicrm#15 from kurund/smarty-upgrade

CRM-12750 - upgrade smarty to 2.6.27
mfb · Jun 3, 2013 · 22ce79a · 22ce79a
2 parents cd02bee + 5c6ca1d
commit 22ce79a
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 163 deletions.
diff --git a/Smarty/Config_File.class.php b/Smarty/Config_File.class.php
@@ -22,7 +22,7 @@
  * smarty-discussion-subscribe@googlegroups.com 
  *
  * @link http://www.smarty.net/
- * @version 2.6.26
+ * @version 2.6.25-dev
  * @copyright Copyright: 2001-2005 New Digital Group, Inc.
  * @author Andrei Zmievski <andrei@php.net>
  * @access public

diff --git a/Smarty/Smarty.class.php b/Smarty/Smarty.class.php
@@ -20,17 +20,17 @@
  *
  * For questions, help, comments, discussion, etc., please join the
  * Smarty mailing list. Send a blank e-mail to
- * smarty-discussion-subscribe@googlegroups.com 
+ * smarty-discussion-subscribe@googlegroups.com
  *
  * @link http://www.smarty.net/
  * @copyright 2001-2005 New Digital Group, Inc.
  * @author Monte Ohrt <monte at ohrt dot com>
  * @author Andrei Zmievski <andrei@php.net>
  * @package Smarty
- * @version 2.6.26
+ * @version 2.6.27
  */
 
-/* $Id: Smarty.class.php 3163 2009-06-17 14:39:24Z monte.ohrt $ */
+/* $Id: Smarty.class.php 4660 2012-09-24 20:05:15Z uwe.tews@googlemail.com $ */
 
 /**
  * DIR_SEP isn't used anymore, but third party apps might
@@ -465,7 +465,7 @@ class Smarty
      *
      * @var string
      */
-    var $_version              = '2.6.26';
+    var $_version              = '2.6.27';
 
     /**
      * current template inclusion depth
@@ -1058,7 +1058,7 @@ function &get_template_vars($name=null)
         } else {
             // var non-existant, return valid reference
             $_tmp = null;
-            return $_tmp;   
+            return $_tmp;
         }
     }
 
@@ -1090,7 +1090,8 @@ function &get_config_vars($name=null)
      */
     function trigger_error($error_msg, $error_type = E_USER_WARNING)
     {
-        trigger_error("Smarty error: $error_msg", $error_type);
+        $msg = htmlentities($error_msg);
+        trigger_error("Smarty error: $msg", $error_type);
     }
 
 
@@ -1117,7 +1118,7 @@ function display($resource_name, $cache_id = null, $compile_id = null)
     function fetch($resource_name, $cache_id = null, $compile_id = null, $display = false)
     {
         static $_cache_info = array();
-        
+
         $_smarty_old_error_level = $this->debugging ? error_reporting() : error_reporting(isset($this->error_reporting)
                ? $this->error_reporting : error_reporting() & ~E_NOTICE);
 
@@ -1510,47 +1511,10 @@ function _compile_source($resource_name, &$source_content, &$compiled_content, $
      */
     function _get_compile_path($resource_name)
     {
-        $compilePath = $this->_get_auto_filename( $this->compile_dir, 
-                                                  $resource_name,
-                                                  $this->_compile_id );
-        $compilePath .= '.php';
-
-        //for 'string:' resource smarty might going to fail to create
-        //compile file, so make sure we should have valid path, CRM-5890
-        $matches = array( );
-        if ( preg_match( '/^(\s+)?string:/', $resource_name, $matches ) ) {
-            if ( !$this->validateCompilePath( $compilePath ) ) {
-                $compilePath = $this->_get_auto_filename( $this->compile_dir, 
-                                                          time().rand(),
-                                                          $this->_compile_id );
-                $compilePath .= '.php';
-            }
-        }
-
-        return $compilePath; 
+        return $this->_get_auto_filename($this->compile_dir, $resource_name,
+                                         $this->_compile_id) . '.php';
     }
-
-    /**
-     *  do check can smarty create a file w/ given path.  
-     */
-    function validateCompilePath( $compilePath ) {
-        //first check for directory.
-        $dirname = dirname( $compilePath );
-        if ( !is_dir( $dirname ) ) {
-            require_once(SMARTY_CORE_DIR . 'core.create_dir_structure.php');
-            smarty_core_create_dir_structure( array('dir' => $dirname ), $this );
-        }
-
-        $isValid = false;
-        if ( $fd = @fopen( $compilePath, 'wb') ) {
-            $isValid = true;
-            @fclose( $fd );
-            @unlink($compilePath);
-        }
-
-        return $isValid;
-    }
-
+
     /**
      * fetch the template info. Gets timestamp, and source
      * if get_source is true
@@ -1970,10 +1934,10 @@ function _eval($code, $params=null)
     {
         return eval($code);
     }
-    
+
     /**
      * Extracts the filter name from the given callback
-     * 
+     *
      * @param callback $function
      * @return string
      */
@@ -1988,7 +1952,7 @@ function _get_filter_name($function)
 			return $function;
 		}
 	}
-  
+
     /**#@-*/
 
 }

diff --git a/Smarty/Smarty_Compiler.class.php b/Smarty/Smarty_Compiler.class.php
@@ -21,7 +21,7 @@
  * @link http://smarty.php.net/
  * @author Monte Ohrt <monte at ohrt dot com>
  * @author Andrei Zmievski <andrei@php.net>
- * @version 2.6.26
+ * @version 2.6.25-dev
  * @copyright 2001-2005 New Digital Group, Inc.
  * @package Smarty
  */

diff --git a/Smarty/plugins/function.cycle.php b/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'];

diff --git a/Smarty/plugins/function.eval.php b/Smarty/plugins/function.eval.php
@@ -20,7 +20,6 @@
  */
 function smarty_function_eval($params, &$smarty)
 {
-    static $compiledCache = array( );
 
     if (!isset($params['var'])) {
         $smarty->trigger_error("eval: missing 'var' parameter");
@@ -31,13 +30,7 @@ function smarty_function_eval($params, &$smarty)
         return;
     }
 
-    $md5 = md5( $params['var'] );
-    if ( isset( $compiledCache[$md5] ) ) {
-        $_var_compiled = $compiledCache[$md5];
-    } else {
-        $smarty->_compile_source('evaluated template', $params['var'], $_var_compiled);
-        $compiledCache[$md5] = $_var_compiled;
-    }
+    $smarty->_compile_source('evaluated template', $params['var'], $_var_compiled);
 
     ob_start();
     $smarty->_eval('?>' . $_var_compiled);

diff --git a/Smarty/plugins/function.fetch.php b/Smarty/plugins/function.fetch.php
@@ -181,12 +181,12 @@ function smarty_function_fetch($params, &$smarty)
                         $content .= fgets($fp,4096);
                     }
                     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]));
                     }
                 }
             } else {

diff --git a/Smarty/plugins/function.math.php b/Smarty/plugins/function.math.php
@@ -37,7 +37,7 @@ function smarty_function_math($params, &$smarty)
     }
 
     // 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');
 
@@ -82,4 +82,4 @@ function smarty_function_math($params, &$smarty)
 
 /* vim: set expandtab: */
 
-?>
+?>
diff --git a/Smarty/plugins/modifier.print_array.php b/Smarty/plugins/modifier.print_array.php