diff --git a/NEWS b/NEWS index 23e4662b..e73dd899 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,6 @@ +Version 2.6.15 (Nov 30th, 2006) +------------------------------- + - change file writing semantics in smarty_core_write_file() to unlink() only when rename() fails or a Windows system is detected (c960657, boots) - update debug.tpl to xhtml 1.1 compliance, fix javascript escaping in debug @@ -17,6 +20,7 @@ Version 2.6.14 (May 28th, 2006) ------------------------------- + - fix compiler bug allowing php tags in secure templates (boots,monte) - un-hide hidden xml open tags (boots) diff --git a/docs/en/designers/language-modifiers/language-modifier-truncate.xml b/docs/en/designers/language-modifiers/language-modifier-truncate.xml index 27a558a8..d7b07d3c 100644 --- a/docs/en/designers/language-modifiers/language-modifier-truncate.xml +++ b/docs/en/designers/language-modifiers/language-modifier-truncate.xml @@ -43,7 +43,7 @@ No ... This is a text string that replaces the truncated text. Its length - is NOT included in the truncation length setting. + is included in the truncation length setting. 3 diff --git a/libs/Config_File.class.php b/libs/Config_File.class.php index 0a02d3b8..a0d0ee3c 100644 --- a/libs/Config_File.class.php +++ b/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.15-dev + * @version 2.6.16-dev * @copyright Copyright: 2001-2005 New Digital Group, Inc. * @author Andrei Zmievski * @access public diff --git a/libs/Smarty.class.php b/libs/Smarty.class.php index 10e561be..efd89dc5 100644 --- a/libs/Smarty.class.php +++ b/libs/Smarty.class.php @@ -27,7 +27,7 @@ * @author Monte Ohrt * @author Andrei Zmievski * @package Smarty - * @version 2.6.15-dev + * @version 2.6.16-dev */ /* $Id$ */ @@ -464,7 +464,7 @@ class Smarty * * @var string */ - var $_version = '2.6.15-dev'; + var $_version = '2.6.16-dev'; /** * current template inclusion depth diff --git a/libs/Smarty_Compiler.class.php b/libs/Smarty_Compiler.class.php index 71d81604..f99bcc24 100644 --- a/libs/Smarty_Compiler.class.php +++ b/libs/Smarty_Compiler.class.php @@ -21,7 +21,7 @@ * @link http://smarty.php.net/ * @author Monte Ohrt * @author Andrei Zmievski - * @version 2.6.15-dev + * @version 2.6.16-dev * @copyright 2001-2005 New Digital Group, Inc. * @package Smarty */