diff --git a/contrib/Smarty-2.6.19/BUGS b/contrib/Smarty-2.6.20/BUGS
similarity index 100%
rename from contrib/Smarty-2.6.19/BUGS
rename to contrib/Smarty-2.6.20/BUGS
diff --git a/contrib/Smarty-2.6.19/COPYING.lib b/contrib/Smarty-2.6.20/COPYING.lib
similarity index 100%
rename from contrib/Smarty-2.6.19/COPYING.lib
rename to contrib/Smarty-2.6.20/COPYING.lib
diff --git a/contrib/Smarty-2.6.19/ChangeLog b/contrib/Smarty-2.6.20/ChangeLog
similarity index 100%
rename from contrib/Smarty-2.6.19/ChangeLog
rename to contrib/Smarty-2.6.20/ChangeLog
diff --git a/contrib/Smarty-2.6.19/FAQ b/contrib/Smarty-2.6.20/FAQ
similarity index 100%
rename from contrib/Smarty-2.6.19/FAQ
rename to contrib/Smarty-2.6.20/FAQ
diff --git a/contrib/Smarty-2.6.19/INSTALL b/contrib/Smarty-2.6.20/INSTALL
similarity index 100%
rename from contrib/Smarty-2.6.19/INSTALL
rename to contrib/Smarty-2.6.20/INSTALL
diff --git a/contrib/Smarty-2.6.19/NEWS b/contrib/Smarty-2.6.20/NEWS
similarity index 99%
rename from contrib/Smarty-2.6.19/NEWS
rename to contrib/Smarty-2.6.20/NEWS
index fa550ff..1e3b77e 100644
--- a/contrib/Smarty-2.6.19/NEWS
+++ b/contrib/Smarty-2.6.20/NEWS
@@ -1,3 +1,15 @@
+Version 2.6.20 (Aug 15th, 2008)
+-------------------------------
+
+- fix cache tag bug when multiple cache tags on a page (mankyd,
+  mohrt)
+- fix /e tag checking when using arrays with regex_replace
+  (mohrt)
+- fix that function results can be used with condition like "is even" in 
+  {if} tags (U.Tews)
+- fix handling of non-empty <pre>-tags and empty <textarea>- and
+  <script>-tags (Spuerhund, messju)
+
 Version 2.6.19 (Feb 11th, 2008)
 -------------------------------
 
diff --git a/contrib/Smarty-2.6.19/QUICK_START b/contrib/Smarty-2.6.20/QUICK_START
similarity index 100%
rename from contrib/Smarty-2.6.19/QUICK_START
rename to contrib/Smarty-2.6.20/QUICK_START
diff --git a/contrib/Smarty-2.6.19/README b/contrib/Smarty-2.6.20/README
similarity index 99%
rename from contrib/Smarty-2.6.19/README
rename to contrib/Smarty-2.6.20/README
index 6e7c93c..c11ed0c 100644
--- a/contrib/Smarty-2.6.19/README
+++ b/contrib/Smarty-2.6.20/README
@@ -2,7 +2,7 @@ NAME:
 
     Smarty - the PHP compiling template engine
 
-VERSION: 2.6.19
+VERSION: 2.6.20
 
 AUTHORS:
     
diff --git a/contrib/Smarty-2.6.19/RELEASE_NOTES b/contrib/Smarty-2.6.20/RELEASE_NOTES
similarity index 100%
rename from contrib/Smarty-2.6.19/RELEASE_NOTES
rename to contrib/Smarty-2.6.20/RELEASE_NOTES
diff --git a/contrib/Smarty-2.6.19/TODO b/contrib/Smarty-2.6.20/TODO
similarity index 100%
rename from contrib/Smarty-2.6.19/TODO
rename to contrib/Smarty-2.6.20/TODO
diff --git a/contrib/Smarty-2.6.19/demo/configs/test.conf b/contrib/Smarty-2.6.20/demo/configs/test.conf
similarity index 100%
rename from contrib/Smarty-2.6.19/demo/configs/test.conf
rename to contrib/Smarty-2.6.20/demo/configs/test.conf
diff --git a/contrib/Smarty-2.6.19/demo/index.php b/contrib/Smarty-2.6.20/demo/index.php
similarity index 100%
rename from contrib/Smarty-2.6.19/demo/index.php
rename to contrib/Smarty-2.6.20/demo/index.php
diff --git a/contrib/Smarty-2.6.19/demo/templates/footer.tpl b/contrib/Smarty-2.6.20/demo/templates/footer.tpl
similarity index 100%
rename from contrib/Smarty-2.6.19/demo/templates/footer.tpl
rename to contrib/Smarty-2.6.20/demo/templates/footer.tpl
diff --git a/contrib/Smarty-2.6.19/demo/templates/header.tpl b/contrib/Smarty-2.6.20/demo/templates/header.tpl
similarity index 100%
rename from contrib/Smarty-2.6.19/demo/templates/header.tpl
rename to contrib/Smarty-2.6.20/demo/templates/header.tpl
diff --git a/contrib/Smarty-2.6.19/demo/templates/index.tpl b/contrib/Smarty-2.6.20/demo/templates/index.tpl
similarity index 100%
rename from contrib/Smarty-2.6.19/demo/templates/index.tpl
rename to contrib/Smarty-2.6.20/demo/templates/index.tpl
diff --git a/contrib/Smarty-2.6.19/libs/Config_File.class.php b/contrib/Smarty-2.6.20/libs/Config_File.class.php
similarity index 99%
rename from contrib/Smarty-2.6.19/libs/Config_File.class.php
rename to contrib/Smarty-2.6.20/libs/Config_File.class.php
index e3c3ca2..a10d304 100644
--- a/contrib/Smarty-2.6.19/libs/Config_File.class.php
+++ b/contrib/Smarty-2.6.20/libs/Config_File.class.php
@@ -18,7 +18,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  * @link http://smarty.php.net/
- * @version 2.6.19
+ * @version 2.6.20
  * @copyright Copyright: 2001-2005 New Digital Group, Inc.
  * @author Andrei Zmievski <andrei@php.net>
  * @access public
diff --git a/contrib/Smarty-2.6.19/libs/Smarty.class.php b/contrib/Smarty-2.6.20/libs/Smarty.class.php
similarity index 99%
rename from contrib/Smarty-2.6.19/libs/Smarty.class.php
rename to contrib/Smarty-2.6.20/libs/Smarty.class.php
index 5eda787..19318e6 100644
--- a/contrib/Smarty-2.6.19/libs/Smarty.class.php
+++ b/contrib/Smarty-2.6.20/libs/Smarty.class.php
@@ -27,7 +27,7 @@
  * @author Monte Ohrt <monte at ohrt dot com>
  * @author Andrei Zmievski <andrei@php.net>
  * @package Smarty
- * @version 2.6.19
+ * @version 2.6.20
  */
 
 /* $Id: Smarty.class.php 2722 2007-06-18 14:29:00Z danilo $ */
@@ -464,7 +464,7 @@ class Smarty
      *
      * @var string
      */
-    var $_version              = '2.6.19';
+    var $_version              = '2.6.20';
 
     /**
      * current template inclusion depth
diff --git a/contrib/Smarty-2.6.19/libs/Smarty_Compiler.class.php b/contrib/Smarty-2.6.20/libs/Smarty_Compiler.class.php
similarity index 99%
rename from contrib/Smarty-2.6.19/libs/Smarty_Compiler.class.php
rename to contrib/Smarty-2.6.20/libs/Smarty_Compiler.class.php
index 52466d3..f09f8de 100644
--- a/contrib/Smarty-2.6.19/libs/Smarty_Compiler.class.php
+++ b/contrib/Smarty-2.6.20/libs/Smarty_Compiler.class.php
@@ -21,12 +21,12 @@
  * @link http://smarty.php.net/
  * @author Monte Ohrt <monte at ohrt dot com>
  * @author Andrei Zmievski <andrei@php.net>
- * @version 2.6.19
+ * @version 2.6.20
  * @copyright 2001-2005 New Digital Group, Inc.
  * @package Smarty
  */
 
-/* $Id: Smarty_Compiler.class.php 2736 2007-09-16 14:47:53Z mohrt $ */
+/* $Id: Smarty_Compiler.class.php 2773 2008-08-12 18:17:51Z Uwe.Tews $ */
 
 /**
  * Template compiling class
@@ -1363,9 +1363,14 @@ class Smarty_Compiler extends Smarty {
                     /* If last token was a ')', we operate on the parenthesized
                        expression. The start of the expression is on the stack.
                        Otherwise, we operate on the last encountered token. */
-                    if ($tokens[$i-1] == ')')
+                    if ($tokens[$i-1] == ')') {
                         $is_arg_start = array_pop($is_arg_stack);
-                    else
+                        if ($is_arg_start != 0) {
+                            if (preg_match('~^' . $this->_func_regexp . '$~', $tokens[$is_arg_start-1])) {
+                                $is_arg_start--;
+                            } 
+                        } 
+                    } else
                         $is_arg_start = $i-1;
                     /* Construct the argument for 'is' expression, so it knows
                        what to operate on. */
diff --git a/contrib/Smarty-2.6.19/libs/debug.tpl b/contrib/Smarty-2.6.20/libs/debug.tpl
similarity index 100%
rename from contrib/Smarty-2.6.19/libs/debug.tpl
rename to contrib/Smarty-2.6.20/libs/debug.tpl
diff --git a/contrib/Smarty-2.6.19/libs/internals/core.assemble_plugin_filepath.php b/contrib/Smarty-2.6.20/libs/internals/core.assemble_plugin_filepath.php
similarity index 100%
rename from contrib/Smarty-2.6.19/libs/internals/core.assemble_plugin_filepath.php
rename to contrib/Smarty-2.6.20/libs/internals/core.assemble_plugin_filepath.php
diff --git a/contrib/Smarty-2.6.19/libs/internals/core.assign_smarty_interface.php b/contrib/Smarty-2.6.20/libs/internals/core.assign_smarty_interface.php
similarity index 100%
rename from contrib/Smarty-2.6.19/libs/internals/core.assign_smarty_interface.php
rename to contrib/Smarty-2.6.20/libs/internals/core.assign_smarty_interface.php
diff --git a/contrib/Smarty-2.6.19/libs/internals/core.create_dir_structure.php b/contrib/Smarty-2.6.20/libs/internals/core.create_dir_structure.php
similarity index 100%
rename from contrib/Smarty-2.6.19/libs/internals/core.create_dir_structure.php
rename to contrib/Smarty-2.6.20/libs/internals/core.create_dir_structure.php
diff --git a/contrib/Smarty-2.6.19/libs/internals/core.display_debug_console.php b/contrib/Smarty-2.6.20/libs/internals/core.display_debug_console.php
similarity index 100%
rename from contrib/Smarty-2.6.19/libs/internals/core.display_debug_console.php
rename to contrib/Smarty-2.6.20/libs/internals/core.display_debug_console.php
diff --git a/contrib/Smarty-2.6.19/libs/internals/core.get_include_path.php b/contrib/Smarty-2.6.20/libs/internals/core.get_include_path.php
similarity index 100%
rename from contrib/Smarty-2.6.19/libs/internals/core.get_include_path.php
rename to contrib/Smarty-2.6.20/libs/internals/core.get_include_path.php
diff --git a/contrib/Smarty-2.6.19/libs/internals/core.get_microtime.php b/contrib/Smarty-2.6.20/libs/internals/core.get_microtime.php
similarity index 100%
rename from contrib/Smarty-2.6.19/libs/internals/core.get_microtime.php
rename to contrib/Smarty-2.6.20/libs/internals/core.get_microtime.php
diff --git a/contrib/Smarty-2.6.19/libs/internals/core.get_php_resource.php b/contrib/Smarty-2.6.20/libs/internals/core.get_php_resource.php
similarity index 100%
rename from contrib/Smarty-2.6.19/libs/internals/core.get_php_resource.php
rename to contrib/Smarty-2.6.20/libs/internals/core.get_php_resource.php
diff --git a/contrib/Smarty-2.6.19/libs/internals/core.is_secure.php b/contrib/Smarty-2.6.20/libs/internals/core.is_secure.php
similarity index 100%
rename from contrib/Smarty-2.6.19/libs/internals/core.is_secure.php
rename to contrib/Smarty-2.6.20/libs/internals/core.is_secure.php
diff --git a/contrib/Smarty-2.6.19/libs/internals/core.is_trusted.php b/contrib/Smarty-2.6.20/libs/internals/core.is_trusted.php
similarity index 100%
rename from contrib/Smarty-2.6.19/libs/internals/core.is_trusted.php
rename to contrib/Smarty-2.6.20/libs/internals/core.is_trusted.php
diff --git a/contrib/Smarty-2.6.19/libs/internals/core.load_plugins.php b/contrib/Smarty-2.6.20/libs/internals/core.load_plugins.php
similarity index 100%
rename from contrib/Smarty-2.6.19/libs/internals/core.load_plugins.php
rename to contrib/Smarty-2.6.20/libs/internals/core.load_plugins.php
diff --git a/contrib/Smarty-2.6.19/libs/internals/core.load_resource_plugin.php b/contrib/Smarty-2.6.20/libs/internals/core.load_resource_plugin.php
similarity index 100%
rename from contrib/Smarty-2.6.19/libs/internals/core.load_resource_plugin.php
rename to contrib/Smarty-2.6.20/libs/internals/core.load_resource_plugin.php
diff --git a/contrib/Smarty-2.6.19/libs/internals/core.process_cached_inserts.php b/contrib/Smarty-2.6.20/libs/internals/core.process_cached_inserts.php
similarity index 100%
rename from contrib/Smarty-2.6.19/libs/internals/core.process_cached_inserts.php
rename to contrib/Smarty-2.6.20/libs/internals/core.process_cached_inserts.php
diff --git a/contrib/Smarty-2.6.19/libs/internals/core.process_compiled_include.php b/contrib/Smarty-2.6.20/libs/internals/core.process_compiled_include.php
similarity index 90%
rename from contrib/Smarty-2.6.19/libs/internals/core.process_compiled_include.php
rename to contrib/Smarty-2.6.20/libs/internals/core.process_compiled_include.php
index d539423..904d597 100644
--- a/contrib/Smarty-2.6.19/libs/internals/core.process_compiled_include.php
+++ b/contrib/Smarty-2.6.20/libs/internals/core.process_compiled_include.php
@@ -25,7 +25,7 @@ function smarty_core_process_compiled_include($params, &$smarty)
         $smarty->_include($_include_file_path, true);
     }
 
-    foreach ($smarty->_cache_serials as $_include_file_path=>$_cache_serial) {
+    foreach ($smarty->_cache_info['cache_serials'] as $_include_file_path=>$_cache_serial) {
         $_return = preg_replace_callback('!(\{nocache\:('.$_cache_serial.')#(\d+)\})!s',
                                          array(&$smarty, '_process_compiled_include_callback'),
                                          $_return);
diff --git a/contrib/Smarty-2.6.19/libs/internals/core.read_cache_file.php b/contrib/Smarty-2.6.20/libs/internals/core.read_cache_file.php
similarity index 100%
rename from contrib/Smarty-2.6.19/libs/internals/core.read_cache_file.php
rename to contrib/Smarty-2.6.20/libs/internals/core.read_cache_file.php
diff --git a/contrib/Smarty-2.6.19/libs/internals/core.rm_auto.php b/contrib/Smarty-2.6.20/libs/internals/core.rm_auto.php
similarity index 100%
rename from contrib/Smarty-2.6.19/libs/internals/core.rm_auto.php
rename to contrib/Smarty-2.6.20/libs/internals/core.rm_auto.php
diff --git a/contrib/Smarty-2.6.19/libs/internals/core.rmdir.php b/contrib/Smarty-2.6.20/libs/internals/core.rmdir.php
similarity index 100%
rename from contrib/Smarty-2.6.19/libs/internals/core.rmdir.php
rename to contrib/Smarty-2.6.20/libs/internals/core.rmdir.php
diff --git a/contrib/Smarty-2.6.19/libs/internals/core.run_insert_handler.php b/contrib/Smarty-2.6.20/libs/internals/core.run_insert_handler.php
similarity index 100%
rename from contrib/Smarty-2.6.19/libs/internals/core.run_insert_handler.php
rename to contrib/Smarty-2.6.20/libs/internals/core.run_insert_handler.php
diff --git a/contrib/Smarty-2.6.19/libs/internals/core.smarty_include_php.php b/contrib/Smarty-2.6.20/libs/internals/core.smarty_include_php.php
similarity index 100%
rename from contrib/Smarty-2.6.19/libs/internals/core.smarty_include_php.php
rename to contrib/Smarty-2.6.20/libs/internals/core.smarty_include_php.php
diff --git a/contrib/Smarty-2.6.19/libs/internals/core.write_cache_file.php b/contrib/Smarty-2.6.20/libs/internals/core.write_cache_file.php
similarity index 100%
rename from contrib/Smarty-2.6.19/libs/internals/core.write_cache_file.php
rename to contrib/Smarty-2.6.20/libs/internals/core.write_cache_file.php
diff --git a/contrib/Smarty-2.6.19/libs/internals/core.write_compiled_include.php b/contrib/Smarty-2.6.20/libs/internals/core.write_compiled_include.php
similarity index 100%
rename from contrib/Smarty-2.6.19/libs/internals/core.write_compiled_include.php
rename to contrib/Smarty-2.6.20/libs/internals/core.write_compiled_include.php
diff --git a/contrib/Smarty-2.6.19/libs/internals/core.write_compiled_resource.php b/contrib/Smarty-2.6.20/libs/internals/core.write_compiled_resource.php
similarity index 100%
rename from contrib/Smarty-2.6.19/libs/internals/core.write_compiled_resource.php
rename to contrib/Smarty-2.6.20/libs/internals/core.write_compiled_resource.php
diff --git a/contrib/Smarty-2.6.19/libs/internals/core.write_file.php b/contrib/Smarty-2.6.20/libs/internals/core.write_file.php
similarity index 100%
rename from contrib/Smarty-2.6.19/libs/internals/core.write_file.php
rename to contrib/Smarty-2.6.20/libs/internals/core.write_file.php
diff --git a/contrib/Smarty-2.6.19/libs/plugins/block.textformat.php b/contrib/Smarty-2.6.20/libs/plugins/block.textformat.php
similarity index 100%
rename from contrib/Smarty-2.6.19/libs/plugins/block.textformat.php
rename to contrib/Smarty-2.6.20/libs/plugins/block.textformat.php
diff --git a/contrib/Smarty-2.6.19/libs/plugins/compiler.assign.php b/contrib/Smarty-2.6.20/libs/plugins/compiler.assign.php
similarity index 100%
rename from contrib/Smarty-2.6.19/libs/plugins/compiler.assign.php
rename to contrib/Smarty-2.6.20/libs/plugins/compiler.assign.php
diff --git a/contrib/Smarty-2.6.19/libs/plugins/function.assign_debug_info.php b/contrib/Smarty-2.6.20/libs/plugins/function.assign_debug_info.php
similarity index 100%
rename from contrib/Smarty-2.6.19/libs/plugins/function.assign_debug_info.php
rename to contrib/Smarty-2.6.20/libs/plugins/function.assign_debug_info.php
diff --git a/contrib/Smarty-2.6.19/libs/plugins/function.config_load.php b/contrib/Smarty-2.6.20/libs/plugins/function.config_load.php
similarity index 100%
rename from contrib/Smarty-2.6.19/libs/plugins/function.config_load.php
rename to contrib/Smarty-2.6.20/libs/plugins/function.config_load.php
diff --git a/contrib/Smarty-2.6.19/libs/plugins/function.counter.php b/contrib/Smarty-2.6.20/libs/plugins/function.counter.php
similarity index 100%
rename from contrib/Smarty-2.6.19/libs/plugins/function.counter.php
rename to contrib/Smarty-2.6.20/libs/plugins/function.counter.php
diff --git a/contrib/Smarty-2.6.19/libs/plugins/function.cycle.php b/contrib/Smarty-2.6.20/libs/plugins/function.cycle.php
similarity index 100%
rename from contrib/Smarty-2.6.19/libs/plugins/function.cycle.php
rename to contrib/Smarty-2.6.20/libs/plugins/function.cycle.php
diff --git a/contrib/Smarty-2.6.19/libs/plugins/function.debug.php b/contrib/Smarty-2.6.20/libs/plugins/function.debug.php
similarity index 100%
rename from contrib/Smarty-2.6.19/libs/plugins/function.debug.php
rename to contrib/Smarty-2.6.20/libs/plugins/function.debug.php
diff --git a/contrib/Smarty-2.6.19/libs/plugins/function.eval.php b/contrib/Smarty-2.6.20/libs/plugins/function.eval.php
similarity index 100%
rename from contrib/Smarty-2.6.19/libs/plugins/function.eval.php
rename to contrib/Smarty-2.6.20/libs/plugins/function.eval.php
diff --git a/contrib/Smarty-2.6.19/libs/plugins/function.fetch.php b/contrib/Smarty-2.6.20/libs/plugins/function.fetch.php
similarity index 100%
rename from contrib/Smarty-2.6.19/libs/plugins/function.fetch.php
rename to contrib/Smarty-2.6.20/libs/plugins/function.fetch.php
diff --git a/contrib/Smarty-2.6.19/libs/plugins/function.html_checkboxes.php b/contrib/Smarty-2.6.20/libs/plugins/function.html_checkboxes.php
similarity index 100%
rename from contrib/Smarty-2.6.19/libs/plugins/function.html_checkboxes.php
rename to contrib/Smarty-2.6.20/libs/plugins/function.html_checkboxes.php
diff --git a/contrib/Smarty-2.6.19/libs/plugins/function.html_image.php b/contrib/Smarty-2.6.20/libs/plugins/function.html_image.php
similarity index 100%
rename from contrib/Smarty-2.6.19/libs/plugins/function.html_image.php
rename to contrib/Smarty-2.6.20/libs/plugins/function.html_image.php
diff --git a/contrib/Smarty-2.6.19/libs/plugins/function.html_options.php b/contrib/Smarty-2.6.20/libs/plugins/function.html_options.php
similarity index 100%
rename from contrib/Smarty-2.6.19/libs/plugins/function.html_options.php
rename to contrib/Smarty-2.6.20/libs/plugins/function.html_options.php
diff --git a/contrib/Smarty-2.6.19/libs/plugins/function.html_radios.php b/contrib/Smarty-2.6.20/libs/plugins/function.html_radios.php
similarity index 100%
rename from contrib/Smarty-2.6.19/libs/plugins/function.html_radios.php
rename to contrib/Smarty-2.6.20/libs/plugins/function.html_radios.php
diff --git a/contrib/Smarty-2.6.19/libs/plugins/function.html_select_date.php b/contrib/Smarty-2.6.20/libs/plugins/function.html_select_date.php
similarity index 100%
rename from contrib/Smarty-2.6.19/libs/plugins/function.html_select_date.php
rename to contrib/Smarty-2.6.20/libs/plugins/function.html_select_date.php
diff --git a/contrib/Smarty-2.6.19/libs/plugins/function.html_select_time.php b/contrib/Smarty-2.6.20/libs/plugins/function.html_select_time.php
similarity index 100%
rename from contrib/Smarty-2.6.19/libs/plugins/function.html_select_time.php
rename to contrib/Smarty-2.6.20/libs/plugins/function.html_select_time.php
diff --git a/contrib/Smarty-2.6.19/libs/plugins/function.html_table.php b/contrib/Smarty-2.6.20/libs/plugins/function.html_table.php
similarity index 100%
rename from contrib/Smarty-2.6.19/libs/plugins/function.html_table.php
rename to contrib/Smarty-2.6.20/libs/plugins/function.html_table.php
diff --git a/contrib/Smarty-2.6.19/libs/plugins/function.mailto.php b/contrib/Smarty-2.6.20/libs/plugins/function.mailto.php
similarity index 100%
rename from contrib/Smarty-2.6.19/libs/plugins/function.mailto.php
rename to contrib/Smarty-2.6.20/libs/plugins/function.mailto.php
diff --git a/contrib/Smarty-2.6.19/libs/plugins/function.math.php b/contrib/Smarty-2.6.20/libs/plugins/function.math.php
similarity index 100%
rename from contrib/Smarty-2.6.19/libs/plugins/function.math.php
rename to contrib/Smarty-2.6.20/libs/plugins/function.math.php
diff --git a/contrib/Smarty-2.6.19/libs/plugins/function.popup.php b/contrib/Smarty-2.6.20/libs/plugins/function.popup.php
similarity index 100%
rename from contrib/Smarty-2.6.19/libs/plugins/function.popup.php
rename to contrib/Smarty-2.6.20/libs/plugins/function.popup.php
diff --git a/contrib/Smarty-2.6.19/libs/plugins/function.popup_init.php b/contrib/Smarty-2.6.20/libs/plugins/function.popup_init.php
similarity index 100%
rename from contrib/Smarty-2.6.19/libs/plugins/function.popup_init.php
rename to contrib/Smarty-2.6.20/libs/plugins/function.popup_init.php
diff --git a/contrib/Smarty-2.6.19/libs/plugins/modifier.capitalize.php b/contrib/Smarty-2.6.20/libs/plugins/modifier.capitalize.php
similarity index 100%
rename from contrib/Smarty-2.6.19/libs/plugins/modifier.capitalize.php
rename to contrib/Smarty-2.6.20/libs/plugins/modifier.capitalize.php
diff --git a/contrib/Smarty-2.6.19/libs/plugins/modifier.cat.php b/contrib/Smarty-2.6.20/libs/plugins/modifier.cat.php
similarity index 100%
rename from contrib/Smarty-2.6.19/libs/plugins/modifier.cat.php
rename to contrib/Smarty-2.6.20/libs/plugins/modifier.cat.php
diff --git a/contrib/Smarty-2.6.19/libs/plugins/modifier.count_characters.php b/contrib/Smarty-2.6.20/libs/plugins/modifier.count_characters.php
similarity index 100%
rename from contrib/Smarty-2.6.19/libs/plugins/modifier.count_characters.php
rename to contrib/Smarty-2.6.20/libs/plugins/modifier.count_characters.php
diff --git a/contrib/Smarty-2.6.19/libs/plugins/modifier.count_paragraphs.php b/contrib/Smarty-2.6.20/libs/plugins/modifier.count_paragraphs.php
similarity index 100%
rename from contrib/Smarty-2.6.19/libs/plugins/modifier.count_paragraphs.php
rename to contrib/Smarty-2.6.20/libs/plugins/modifier.count_paragraphs.php
diff --git a/contrib/Smarty-2.6.19/libs/plugins/modifier.count_sentences.php b/contrib/Smarty-2.6.20/libs/plugins/modifier.count_sentences.php
similarity index 100%
rename from contrib/Smarty-2.6.19/libs/plugins/modifier.count_sentences.php
rename to contrib/Smarty-2.6.20/libs/plugins/modifier.count_sentences.php
diff --git a/contrib/Smarty-2.6.19/libs/plugins/modifier.count_words.php b/contrib/Smarty-2.6.20/libs/plugins/modifier.count_words.php
similarity index 100%
rename from contrib/Smarty-2.6.19/libs/plugins/modifier.count_words.php
rename to contrib/Smarty-2.6.20/libs/plugins/modifier.count_words.php
diff --git a/contrib/Smarty-2.6.19/libs/plugins/modifier.date_format.php b/contrib/Smarty-2.6.20/libs/plugins/modifier.date_format.php
similarity index 100%
rename from contrib/Smarty-2.6.19/libs/plugins/modifier.date_format.php
rename to contrib/Smarty-2.6.20/libs/plugins/modifier.date_format.php
diff --git a/contrib/Smarty-2.6.19/libs/plugins/modifier.debug_print_var.php b/contrib/Smarty-2.6.20/libs/plugins/modifier.debug_print_var.php
similarity index 100%
rename from contrib/Smarty-2.6.19/libs/plugins/modifier.debug_print_var.php
rename to contrib/Smarty-2.6.20/libs/plugins/modifier.debug_print_var.php
diff --git a/contrib/Smarty-2.6.19/libs/plugins/modifier.default.php b/contrib/Smarty-2.6.20/libs/plugins/modifier.default.php
similarity index 100%
rename from contrib/Smarty-2.6.19/libs/plugins/modifier.default.php
rename to contrib/Smarty-2.6.20/libs/plugins/modifier.default.php
diff --git a/contrib/Smarty-2.6.19/libs/plugins/modifier.escape.php b/contrib/Smarty-2.6.20/libs/plugins/modifier.escape.php
similarity index 100%
rename from contrib/Smarty-2.6.19/libs/plugins/modifier.escape.php
rename to contrib/Smarty-2.6.20/libs/plugins/modifier.escape.php
diff --git a/contrib/Smarty-2.6.19/libs/plugins/modifier.indent.php b/contrib/Smarty-2.6.20/libs/plugins/modifier.indent.php
similarity index 100%
rename from contrib/Smarty-2.6.19/libs/plugins/modifier.indent.php
rename to contrib/Smarty-2.6.20/libs/plugins/modifier.indent.php
diff --git a/contrib/Smarty-2.6.19/libs/plugins/modifier.lower.php b/contrib/Smarty-2.6.20/libs/plugins/modifier.lower.php
similarity index 100%
rename from contrib/Smarty-2.6.19/libs/plugins/modifier.lower.php
rename to contrib/Smarty-2.6.20/libs/plugins/modifier.lower.php
diff --git a/contrib/Smarty-2.6.19/libs/plugins/modifier.nl2br.php b/contrib/Smarty-2.6.20/libs/plugins/modifier.nl2br.php
similarity index 100%
rename from contrib/Smarty-2.6.19/libs/plugins/modifier.nl2br.php
rename to contrib/Smarty-2.6.20/libs/plugins/modifier.nl2br.php
diff --git a/contrib/Smarty-2.6.19/libs/plugins/modifier.regex_replace.php b/contrib/Smarty-2.6.20/libs/plugins/modifier.regex_replace.php
similarity index 78%
rename from contrib/Smarty-2.6.19/libs/plugins/modifier.regex_replace.php
rename to contrib/Smarty-2.6.20/libs/plugins/modifier.regex_replace.php
index d1f1545..100b58c 100644
--- a/contrib/Smarty-2.6.19/libs/plugins/modifier.regex_replace.php
+++ b/contrib/Smarty-2.6.20/libs/plugins/modifier.regex_replace.php
@@ -21,6 +21,18 @@
  * @return string
  */
 function smarty_modifier_regex_replace($string, $search, $replace)
+{
+    if(is_array($search)) {
+      foreach($search as $idx => $s)
+        $search[$idx] = _smarty_regex_replace_check($s);
+    } else {
+      $search = _smarty_regex_replace_check($search);
+    }       
+
+    return preg_replace($search, $replace, $string);
+}
+
+function _smarty_regex_replace_check($search)
 {
     if (($pos = strpos($search,"\0")) !== false)
       $search = substr($search,0,$pos);
@@ -28,8 +40,7 @@ function smarty_modifier_regex_replace($string, $search, $replace)
         /* remove eval-modifier from $search */
         $search = substr($search, 0, -strlen($match[1])) . preg_replace('![e\s]+!', '', $match[1]);
     }
-       
-    return preg_replace($search, $replace, $string);
+    return $search;
 }
 
 /* vim: set expandtab: */
diff --git a/contrib/Smarty-2.6.19/libs/plugins/modifier.replace.php b/contrib/Smarty-2.6.20/libs/plugins/modifier.replace.php
similarity index 100%
rename from contrib/Smarty-2.6.19/libs/plugins/modifier.replace.php
rename to contrib/Smarty-2.6.20/libs/plugins/modifier.replace.php
diff --git a/contrib/Smarty-2.6.19/libs/plugins/modifier.spacify.php b/contrib/Smarty-2.6.20/libs/plugins/modifier.spacify.php
similarity index 100%
rename from contrib/Smarty-2.6.19/libs/plugins/modifier.spacify.php
rename to contrib/Smarty-2.6.20/libs/plugins/modifier.spacify.php
diff --git a/contrib/Smarty-2.6.19/libs/plugins/modifier.string_format.php b/contrib/Smarty-2.6.20/libs/plugins/modifier.string_format.php
similarity index 100%
rename from contrib/Smarty-2.6.19/libs/plugins/modifier.string_format.php
rename to contrib/Smarty-2.6.20/libs/plugins/modifier.string_format.php
diff --git a/contrib/Smarty-2.6.19/libs/plugins/modifier.strip.php b/contrib/Smarty-2.6.20/libs/plugins/modifier.strip.php
similarity index 100%
rename from contrib/Smarty-2.6.19/libs/plugins/modifier.strip.php
rename to contrib/Smarty-2.6.20/libs/plugins/modifier.strip.php
diff --git a/contrib/Smarty-2.6.19/libs/plugins/modifier.strip_tags.php b/contrib/Smarty-2.6.20/libs/plugins/modifier.strip_tags.php
similarity index 100%
rename from contrib/Smarty-2.6.19/libs/plugins/modifier.strip_tags.php
rename to contrib/Smarty-2.6.20/libs/plugins/modifier.strip_tags.php
diff --git a/contrib/Smarty-2.6.19/libs/plugins/modifier.truncate.php b/contrib/Smarty-2.6.20/libs/plugins/modifier.truncate.php
similarity index 100%
rename from contrib/Smarty-2.6.19/libs/plugins/modifier.truncate.php
rename to contrib/Smarty-2.6.20/libs/plugins/modifier.truncate.php
diff --git a/contrib/Smarty-2.6.19/libs/plugins/modifier.upper.php b/contrib/Smarty-2.6.20/libs/plugins/modifier.upper.php
similarity index 100%
rename from contrib/Smarty-2.6.19/libs/plugins/modifier.upper.php
rename to contrib/Smarty-2.6.20/libs/plugins/modifier.upper.php
diff --git a/contrib/Smarty-2.6.19/libs/plugins/modifier.wordwrap.php b/contrib/Smarty-2.6.20/libs/plugins/modifier.wordwrap.php
similarity index 100%
rename from contrib/Smarty-2.6.19/libs/plugins/modifier.wordwrap.php
rename to contrib/Smarty-2.6.20/libs/plugins/modifier.wordwrap.php
diff --git a/contrib/Smarty-2.6.19/libs/plugins/outputfilter.trimwhitespace.php b/contrib/Smarty-2.6.20/libs/plugins/outputfilter.trimwhitespace.php
similarity index 85%
rename from contrib/Smarty-2.6.19/libs/plugins/outputfilter.trimwhitespace.php
rename to contrib/Smarty-2.6.20/libs/plugins/outputfilter.trimwhitespace.php
index 97b0d21..739fa39 100644
--- a/contrib/Smarty-2.6.19/libs/plugins/outputfilter.trimwhitespace.php
+++ b/contrib/Smarty-2.6.20/libs/plugins/outputfilter.trimwhitespace.php
@@ -28,21 +28,21 @@
 function smarty_outputfilter_trimwhitespace($source, &$smarty)
 {
     // Pull out the script blocks
-    preg_match_all("!<script[^>]+>.*?</script>!is", $source, $match);
+    preg_match_all("!<script[^>]*?>.*?</script>!is", $source, $match);
     $_script_blocks = $match[0];
-    $source = preg_replace("!<script[^>]+>.*?</script>!is",
+    $source = preg_replace("!<script[^>]*?>.*?</script>!is",
                            '@@@SMARTY:TRIM:SCRIPT@@@', $source);
 
     // Pull out the pre blocks
-    preg_match_all("!<pre>.*?</pre>!is", $source, $match);
+    preg_match_all("!<pre[^>]*?>.*?</pre>!is", $source, $match);
     $_pre_blocks = $match[0];
-    $source = preg_replace("!<pre>.*?</pre>!is",
+    $source = preg_replace("!<pre[^>]*?>.*?</pre>!is",
                            '@@@SMARTY:TRIM:PRE@@@', $source);
-
+    
     // Pull out the textarea blocks
-    preg_match_all("!<textarea[^>]+>.*?</textarea>!is", $source, $match);
+    preg_match_all("!<textarea[^>]*?>.*?</textarea>!is", $source, $match);
     $_textarea_blocks = $match[0];
-    $source = preg_replace("!<textarea[^>]+>.*?</textarea>!is",
+    $source = preg_replace("!<textarea[^>]*?>.*?</textarea>!is",
                            '@@@SMARTY:TRIM:TEXTAREA@@@', $source);
 
     // remove all leading spaces, tabs and carriage returns NOT
diff --git a/contrib/Smarty-2.6.19/libs/plugins/shared.escape_special_chars.php b/contrib/Smarty-2.6.20/libs/plugins/shared.escape_special_chars.php
similarity index 100%
rename from contrib/Smarty-2.6.19/libs/plugins/shared.escape_special_chars.php
rename to contrib/Smarty-2.6.20/libs/plugins/shared.escape_special_chars.php
diff --git a/contrib/Smarty-2.6.19/libs/plugins/shared.make_timestamp.php b/contrib/Smarty-2.6.20/libs/plugins/shared.make_timestamp.php
similarity index 100%
rename from contrib/Smarty-2.6.19/libs/plugins/shared.make_timestamp.php
rename to contrib/Smarty-2.6.20/libs/plugins/shared.make_timestamp.php
diff --git a/contrib/Smarty-2.6.19/misc/smarty_icon.README b/contrib/Smarty-2.6.20/misc/smarty_icon.README
similarity index 100%
rename from contrib/Smarty-2.6.19/misc/smarty_icon.README
rename to contrib/Smarty-2.6.20/misc/smarty_icon.README
diff --git a/contrib/Smarty-2.6.19/misc/smarty_icon.gif b/contrib/Smarty-2.6.20/misc/smarty_icon.gif
similarity index 100%
rename from contrib/Smarty-2.6.19/misc/smarty_icon.gif
rename to contrib/Smarty-2.6.20/misc/smarty_icon.gif
diff --git a/contrib/Smarty-2.6.19/unit_test/README b/contrib/Smarty-2.6.20/unit_test/README
similarity index 100%
rename from contrib/Smarty-2.6.19/unit_test/README
rename to contrib/Smarty-2.6.20/unit_test/README
diff --git a/contrib/Smarty-2.6.19/unit_test/config.php b/contrib/Smarty-2.6.20/unit_test/config.php
similarity index 100%
rename from contrib/Smarty-2.6.19/unit_test/config.php
rename to contrib/Smarty-2.6.20/unit_test/config.php
diff --git a/contrib/Smarty-2.6.19/unit_test/configs/globals_double_quotes.conf b/contrib/Smarty-2.6.20/unit_test/configs/globals_double_quotes.conf
similarity index 100%
rename from contrib/Smarty-2.6.19/unit_test/configs/globals_double_quotes.conf
rename to contrib/Smarty-2.6.20/unit_test/configs/globals_double_quotes.conf
diff --git a/contrib/Smarty-2.6.19/unit_test/configs/globals_single_quotes.conf b/contrib/Smarty-2.6.20/unit_test/configs/globals_single_quotes.conf
similarity index 100%
rename from contrib/Smarty-2.6.19/unit_test/configs/globals_single_quotes.conf
rename to contrib/Smarty-2.6.20/unit_test/configs/globals_single_quotes.conf
diff --git a/contrib/Smarty-2.6.19/unit_test/smarty_unit_test.php b/contrib/Smarty-2.6.20/unit_test/smarty_unit_test.php
similarity index 100%
rename from contrib/Smarty-2.6.19/unit_test/smarty_unit_test.php
rename to contrib/Smarty-2.6.20/unit_test/smarty_unit_test.php
diff --git a/contrib/Smarty-2.6.19/unit_test/smarty_unit_test_gui.php b/contrib/Smarty-2.6.20/unit_test/smarty_unit_test_gui.php
similarity index 100%
rename from contrib/Smarty-2.6.19/unit_test/smarty_unit_test_gui.php
rename to contrib/Smarty-2.6.20/unit_test/smarty_unit_test_gui.php
diff --git a/contrib/Smarty-2.6.19/unit_test/templates/assign_var.tpl b/contrib/Smarty-2.6.20/unit_test/templates/assign_var.tpl
similarity index 100%
rename from contrib/Smarty-2.6.19/unit_test/templates/assign_var.tpl
rename to contrib/Smarty-2.6.20/unit_test/templates/assign_var.tpl
diff --git a/contrib/Smarty-2.6.19/unit_test/templates/constant.tpl b/contrib/Smarty-2.6.20/unit_test/templates/constant.tpl
similarity index 100%
rename from contrib/Smarty-2.6.19/unit_test/templates/constant.tpl
rename to contrib/Smarty-2.6.20/unit_test/templates/constant.tpl
diff --git a/contrib/Smarty-2.6.19/unit_test/templates/index.tpl b/contrib/Smarty-2.6.20/unit_test/templates/index.tpl
similarity index 100%
rename from contrib/Smarty-2.6.19/unit_test/templates/index.tpl
rename to contrib/Smarty-2.6.20/unit_test/templates/index.tpl
diff --git a/contrib/Smarty-2.6.19/unit_test/templates/parse_math.tpl b/contrib/Smarty-2.6.20/unit_test/templates/parse_math.tpl
similarity index 100%
rename from contrib/Smarty-2.6.19/unit_test/templates/parse_math.tpl
rename to contrib/Smarty-2.6.20/unit_test/templates/parse_math.tpl
diff --git a/contrib/Smarty-2.6.19/unit_test/templates/parse_obj_meth.tpl b/contrib/Smarty-2.6.20/unit_test/templates/parse_obj_meth.tpl
similarity index 100%
rename from contrib/Smarty-2.6.19/unit_test/templates/parse_obj_meth.tpl
rename to contrib/Smarty-2.6.20/unit_test/templates/parse_obj_meth.tpl
diff --git a/contrib/Smarty-2.6.19/unit_test/test_cases.php b/contrib/Smarty-2.6.20/unit_test/test_cases.php
similarity index 100%
rename from contrib/Smarty-2.6.19/unit_test/test_cases.php
rename to contrib/Smarty-2.6.20/unit_test/test_cases.php
diff --git a/contrib/smarty b/contrib/smarty
index e2d53ee..a55cbfd 120000
--- a/contrib/smarty
+++ b/contrib/smarty
@@ -1 +1 @@
-Smarty-2.6.19
\ No newline at end of file
+Smarty-2.6.20
\ No newline at end of file