Uwe Tews 
							
						 
					 
					
						
						
							
						
						f92af96419 
					 
					
						
						
							
							fixed $smarty->debugging on merged compiled subtemplates  
						
						 
						
						
						
						
							
						
					 
					
						2014-11-08 21:02:14 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Uwe Tews 
							
						 
					 
					
						
						
							
						
						8f8d462b8a 
					 
					
						
						
							
							add code of template functions called in nocache mode dynamically to cache file  
						
						 
						
						
						
						
							
						
					 
					
						2014-11-08 17:19:53 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								uwetews 
							
						 
					 
					
						
						
							
						
						845c4184b2 
					 
					
						
						
							
							Merge pull request  #9  from uwetews/master  
						
						 
						
						... 
						
						
						
						new $smarty->debug options 
						
						
							
						
					 
					
						2014-11-04 19:00:56 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Uwe Tews 
							
						 
					 
					
						
						
							
						
						963e5dae5e 
					 
					
						
						
							
							new $smarty->debug options  
						
						 
						
						... 
						
						
						
						- new feature $smarty->debug = true; => overwrite existing Debug Console
window (old behaviour)
$smarty->debug = 2; => individual Debug Console window by template name 
						
						
							
						
					 
					
						2014-11-04 18:59:57 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								uwetews 
							
						 
					 
					
						
						
							
						
						5b1c649c6a 
					 
					
						
						
							
							Merge pull request  #8  from uwetews/master  
						
						 
						
						... 
						
						
						
						Debug Console Update 
						
						
							
						
					 
					
						2014-11-03 22:31:13 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Uwe Tews 
							
						 
					 
					
						
						
							
						
						158b7be58a 
					 
					
						
						
							
							Debug Console Update  
						
						 
						
						... 
						
						
						
						- bugfix Debug Console did not show included subtemplates since 3.1.17
(forum 25301)
- bugfix Modifier debug_print_var did not limit recursion or prevent
recursive object display at Debug Console
(ATTENTION: parameter order has changed to be able to specify maximum
recursion)
- bugfix Debug consol did not include subtemplate information with
$smarty->merge_compiled_includes = true
- improvement The template variables are no longer displayed as objects
on the Debug Console
- improvement $smarty->createData($parent = null, $name = null) new
optional name parameter for display at Debug Console
- addition of some hooks for future extension of Debug Console 
						
						
							
						
					 
					
						2014-11-03 22:27:32 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								uwetews 
							
						 
					 
					
						
						
							
						
						4b3196fe30 
					 
					
						
						
							
							Merge pull request  #2  from smarty-php/master  
						
						 
						
						... 
						
						
						
						Merge pull request #7  from uwetews/master 
						
						
							
						
					 
					
						2014-11-02 14:57:41 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								uwetews 
							
						 
					 
					
						
						
							
						
						4369b2fe05 
					 
					
						
						
							
							Merge pull request  #7  from uwetews/master  
						
						 
						
						... 
						
						
						
						-bugfix and enhancement on subtemplate {include} and template {function} 
						
						
							
						
					 
					
						2014-11-01 22:52:01 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Uwe Tews 
							
						 
					 
					
						
						
							
						
						bc13ebbc9b 
					 
					
						
						
							
							-bugfix and enhancement on subtemplate {include} and template {function} tags.  
						
						 
						
						... 
						
						
						
						* Calling a template which has a nocache section could fail if it was
called from a cached and a not cached subtemplate.
* Calling the same subtemplate cached and not cached with the
$smarty->merge_compiled_includes enabled could cause problems
* Many smaller related changes 
						
						
							
						
					 
					
						2014-11-01 22:42:34 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								uwetews 
							
						 
					 
					
						
						
							
						
						5f2f292739 
					 
					
						
						
							
							Merge pull request  #1  from smarty-php/master  
						
						 
						
						... 
						
						
						
						merge 
						
						
							
						
					 
					
						2014-11-01 11:24:58 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Smarty PHP Template Engine 
							
						 
					 
					
						
						
							
						
						337ab5bd1e 
					 
					
						
						
							
							Merge pull request  #6  from aivus/patch-1  
						
						 
						
						... 
						
						
						
						Clean merge conflicts 
						
						
							
						
					 
					
						2014-11-01 11:14:25 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ilya Antipenko 
							
						 
					 
					
						
						
							
						
						95cc39deb6 
					 
					
						
						
							
							Clean merge conflicts  
						
						 
						
						
						
						
							
						
					 
					
						2014-11-01 11:22:03 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Smarty PHP Template Engine 
							
						 
					 
					
						
						
							
						
						402547baaf 
					 
					
						
						
							
							Merge pull request  #5  from uwetews/master  
						
						 
						
						... 
						
						
						
						resolved merge conflict 
						
						
							
						
					 
					
						2014-11-01 00:42:31 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Uwe Tews 
							
						 
					 
					
						
						
							
						
						199c16e827 
					 
					
						
						
							
							resolved merge conflict  
						
						 
						
						
						
						
							
						
					 
					
						2014-11-01 00:34:32 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Uwe Tews 
							
						 
					 
					
						
						
							
						
						84e5ef7345 
					 
					
						
						
							
							3.1.22-dev  
						
						 
						
						
						
						
							
						
					 
					
						2014-10-31 05:48:52 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Uwe Tews 
							
						 
					 
					
						
						
							
						
						21204c6613 
					 
					
						
						
							
							Merge branch 'trunk'  
						
						 
						
						
						
						
							
						
					 
					
						2014-10-31 05:31:56 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Uwe Tews 
							
						 
					 
					
						
						
							
						
						1f878e6d74 
					 
					
						
						
							
							v3.1.21  
						
						 
						
						
						
						
							
  v3.1.21
 
						
					 
					
						2014-10-31 05:22:20 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Uwe Tews 
							
						 
					 
					
						
						
							
						
						6254b5d4df 
					 
					
						
						
							
							Merge branch 'v3.1.21'  
						
						 
						
						
						
						
							
						
					 
					
						2014-10-31 05:16:16 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Uwe Tews 
							
						 
					 
					
						
						
							
						
						cef27602bb 
					 
					
						
						
							
							v3.1.20  
						
						 
						
						
						
						
							
  v3.1.20
 
						
					 
					
						2014-10-31 05:12:39 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Uwe Tews 
							
						 
					 
					
						
						
							
						
						1153afe2f5 
					 
					
						
						
							
							Merge branch 'v3.1.20'  
						
						 
						
						
						
						
							
						
					 
					
						2014-10-31 05:05:40 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Uwe Tews 
							
						 
					 
					
						
						
							
						
						be0fd3186c 
					 
					
						
						
							
							Merge branch 'v3.1.19'  
						
						 
						
						
						
						
							
  v3.1.19
 
						
					 
					
						2014-10-31 02:29:14 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Uwe Tews 
							
						 
					 
					
						
						
							
						
						c65444124a 
					 
					
						
						
							
							v3.1.19  
						
						 
						
						
						
						
							
						
					 
					
						2014-10-31 02:26:40 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Uwe Tews 
							
						 
					 
					
						
						
							
						
						bf1de6c105 
					 
					
						
						
							
							Merge branch 'v3.1.18'  
						
						 
						
						
						
						
							
  v3.1.18
 
						
					 
					
						2014-10-31 02:15:15 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Uwe Tews 
							
						 
					 
					
						
						
							
						
						97decc4c04 
					 
					
						
						
							
							Merge branch 'v3.1.17'  
						
						 
						
						
						
						
							
  v3.1.17
 
						
					 
					
						2014-10-31 02:10:17 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Uwe Tews 
							
						 
					 
					
						
						
							
						
						43be80762e 
					 
					
						
						
							
							Merge branch 'v3.1.16'  
						
						 
						
						
						
						
							
  v3.1.16
 
						
					 
					
						2014-10-31 02:05:49 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Uwe Tews 
							
						 
					 
					
						
						
							
						
						1bdaf9a2a6 
					 
					
						
						
							
							v3.1.15  
						
						 
						
						
						
						
							
  v3.1.15
 
						
					 
					
						2014-10-31 02:02:52 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Uwe Tews 
							
						 
					 
					
						
						
							
						
						4281d16bd4 
					 
					
						
						
							
							Merge branch 'v3.1.15'  
						
						 
						
						
						
						
							
						
					 
					
						2014-10-31 01:59:07 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Uwe Tews 
							
						 
					 
					
						
						
							
						
						5ea2a50161 
					 
					
						
						
							
							v3.1.14  
						
						 
						
						
						
						
							
  v3.1.14
 
						
					 
					
						2014-10-31 01:55:21 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Uwe Tews 
							
						 
					 
					
						
						
							
						
						8c18f8664c 
					 
					
						
						
							
							Merge branch 'v3.1.14'  
						
						 
						
						
						
						
							
						
					 
					
						2014-10-31 01:52:37 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Uwe Tews 
							
						 
					 
					
						
						
							
						
						7b2a2c4a88 
					 
					
						
						
							
							Merge branch 'v3.1.13'  
						
						 
						
						
						
						
							
  v3.1.13
 
						
					 
					
						2014-10-31 01:47:26 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Uwe Tews 
							
						 
					 
					
						
						
							
						
						014e8bc2be 
					 
					
						
						
							
							Merge branch 'v3.1.12'  
						
						 
						
						... 
						
						
						
						Conflicts:
	change_log.txt 
						
						
							
  v3.1.12
 
						
					 
					
						2014-10-31 01:41:04 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Uwe Tews 
							
						 
					 
					
						
						
							
						
						25d1339bea 
					 
					
						
						
							
							v3.1.12  
						
						 
						
						
						
						
							
						
					 
					
						2014-10-31 01:38:04 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Uwe Tews 
							
						 
					 
					
						
						
							
						
						0b24c4520b 
					 
					
						
						
							
							Merge branch 'v3.1.11'  
						
						 
						
						
						
						
							
  v3.1.11
 
						
					 
					
						2014-10-31 01:35:16 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Uwe Tews 
							
						 
					 
					
						
						
							
						
						5b6aa49b23 
					 
					
						
						
							
							prepare 3.1  
						
						 
						
						
						
						
							
						
					 
					
						2014-10-31 01:34:24 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Uwe Tews 
							
						 
					 
					
						
						
							
						
						af7a4c10e2 
					 
					
						
						
							
							v3.1.11  
						
						 
						
						
						
						
							
						
					 
					
						2014-10-31 01:30:32 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Uwe Tews 
							
						 
					 
					
						
						
							
						
						f83b3effc6 
					 
					
						
						
							
							prepare 3.1  
						
						 
						
						
						
						
							
						
					 
					
						2014-10-31 01:28:26 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Uwe Tews 
							
						 
					 
					
						
						
							
						
						0ecdd6c41d 
					 
					
						
						
							
							Merge branch 'v2.6.28'  
						
						 
						
						
						
						
							
  v2.6.28
 
						
					 
					
						2014-10-31 01:07:20 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Uwe Tews 
							
						 
					 
					
						
						
							
						
						a4ff415bfa 
					 
					
						
						
							
							delete unneeded  
						
						 
						
						
						
						
							
						
					 
					
						2014-10-31 01:06:18 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Uwe Tews 
							
						 
					 
					
						
						
							
						
						9a36601dad 
					 
					
						
						
							
							Merge branch 'v2.6.27'  
						
						 
						
						
						
						
							
  v2.6.27
 
						
					 
					
						2014-10-31 01:03:22 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Uwe Tews 
							
						 
					 
					
						
						
							
						
						1594e08924 
					 
					
						
						
							
							delete unneeded  
						
						 
						
						
						
						
							
						
					 
					
						2014-10-31 01:02:41 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Uwe Tews 
							
						 
					 
					
						
						
							
						
						ad3e64b890 
					 
					
						
						
							
							Merge branch 'v2.6.26'  
						
						 
						
						
						
						
							
  v2.6.26
 
						
					 
					
						2014-10-31 00:57:26 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Uwe Tews 
							
						 
					 
					
						
						
							
						
						8bcad8125a 
					 
					
						
						
							
							delete unneeded  
						
						 
						
						
						
						
							
						
					 
					
						2014-10-31 00:56:50 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Uwe Tews 
							
						 
					 
					
						
						
							
						
						de8354e152 
					 
					
						
						
							
							Merge branch 'v2.6.25'  
						
						 
						
						
						
						
							
  v2.6.25
 
						
					 
					
						2014-10-31 00:52:59 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Uwe Tews 
							
						 
					 
					
						
						
							
						
						9e6dddeee4 
					 
					
						
						
							
							delete unneeded  
						
						 
						
						
						
						
							
						
					 
					
						2014-10-31 00:52:20 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Uwe Tews 
							
						 
					 
					
						
						
							
						
						79ce93d4fd 
					 
					
						
						
							
							Merge branch 'v2.6.24'  
						
						 
						
						
						
						
							
  v2.6.24
 
						
					 
					
						2014-10-31 00:47:33 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Uwe Tews 
							
						 
					 
					
						
						
							
						
						1bd813d939 
					 
					
						
						
							
							delete unneeded  
						
						 
						
						
						
						
							
						
					 
					
						2014-10-31 00:46:27 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Uwe Tews 
							
						 
					 
					
						
						
							
						
						f433b70cf1 
					 
					
						
						
							
							Init  
						
						 
						
						
						
						
							
						
					 
					
						2014-10-31 00:42:46 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Uwe Tews 
							
						 
					 
					
						
						
							
						
						52fb7b1e25 
					 
					
						
						
							
							- bugfix access to class constant by object like {$object::CONST} or variable class name {$class::CONST} did not work (forum 25301)  me  
						
						 
						
						
						
						
							
						
					 
					
						2014-10-30 00:55:01 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Uwe Tews 
							
						 
					 
					
						
						
							
						
						0c9ca2994e 
					 
					
						
						
							
							- bugfix merge_compiled_includes option failed when caching  enables and same subtemplate was included cached and not cached  
						
						 
						
						
						
						
							
						
					 
					
						2014-10-26 09:47:10 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Uwe Tews 
							
						 
					 
					
						
						
							
						
						f7955513b2 
					 
					
						
						
							
							Revert "- bugfix template function call handler must never be called as nocache code"  
						
						 
						
						... 
						
						
						
						This reverts commit db183d1aa4 . 
						
						
							
						
					 
					
						2014-10-24 00:09:45 +02:00