cvs: smarty / NEWS /libs Smarty_Compiler.class.php
[email protected] ("Messju Mohr")
| Newsgroups | php.smarty.cvs |
|---|---|
| Message-ID | <cvsmessju1133266975@cvsserver> |
messju Tue Nov 29 07:22:55 2005 EDT
Modified files:
/smarty NEWS
/smarty/libs Smarty_Compiler.class.php
Log:
fixed code generation of non-cacheable blocks to play well with php's
"Alternative syntax" used for example in compiled {if}..{else}..{/if}
blocks.
(see: http://php.net/manual/en/control-structures.alternative-syntax.php
on "Alternative syntax")
thanks to kihara from the forum.
http://cvs.php.net/diff.php/smarty/NEWS?r1=1.518&r2=1.519&ty=u
Index: smarty/NEWS
diff -u smarty/NEWS:1.518 smarty/NEWS:1.519
--- smarty/NEWS:1.518 Sat Nov 26 11:59:00 2005
+++ smarty/NEWS Tue Nov 29 07:22:51 2005
@@ -1,3 +1,5 @@
+ - fixed code generation of non-cacheable blocks to play well with php's
+ "Alternative syntax for control structures" (kihara, messju)
- fix handling of multiple identical inserts in one display()-call (messju)
- replace {} string access with equivalent substr() to avoid E_STRICT
warnings in PHP 5.1 (boots)
http://cvs.php.net/diff.php/smarty/libs/Smarty_Compiler.class.php?r1=1.372&r2=1.373&ty=u
Index: smarty/libs/Smarty_Compiler.class.php
diff -u smarty/libs/Smarty_Compiler.class.php:1.372 smarty/libs/Smarty_Compiler.class.php:1.373
--- smarty/libs/Smarty_Compiler.class.php:1.372 Wed Nov 23 15:36:04 2005
+++ smarty/libs/Smarty_Compiler.class.php Tue Nov 29 07:22:54 2005
@@ -26,7 +26,7 @@
* @package Smarty
*/
-/* $Id: Smarty_Compiler.class.php,v 1.372 2005/11/23 20:36:04 boots Exp $ */
+/* $Id: Smarty_Compiler.class.php,v 1.373 2005/11/29 12:22:54 messju Exp $ */
/**
* Template compiling class
@@ -2216,7 +2216,7 @@
if (!isset($this->_cache_serial)) $this->_cache_serial = md5(uniqid('Smarty'));
$_ret = 'if ($this->caching && !$this->_cache_including) { echo \'{nocache:'
. $this->_cache_serial . '#' . $this->_nocache_count
- . '}\';}';
+ . '}\'; };';
return $_ret;
}
@@ -2233,7 +2233,7 @@
|| --$this->_cacheable_state>0) return '';
return 'if ($this->caching && !$this->_cache_including) { echo \'{/nocache:'
. $this->_cache_serial . '#' . ($this->_nocache_count++)
- . '}\';}';
+ . '}\'; };';
}