merge svn into github; fix conflict in config.inc.php's require_once config.local.php line

CHANGELOG.TXT

@@ -9,6 +9,22 @@
 # Last update:
 # $Id$
 
+Changes since 3.0 beta3
+-------------------------------------------------
+
+  - add sqlite backend option
+  - language update: tw, cs
+  - fix escaping in gen_show_status() (could be used to DOS list-virtual by
+    creating a mail address with special chars)
+  - list.tpl: base edit/editactive/delete links in list.tpl on $RAW_item to
+    avoid double escaping, and fix some corner cases
+  - editform.tpl: add {if} block for description column for easier customization
+  - use smarty html_options instead of select_options()
+  - remove advice about using SetEnv for database password
+  - include_once(config.local.php) instead of include()ing it to prevent include
+    loops if someone copies config.inc.php to config.local.php
+  - vacation.pl: encode wide-chars utf8 in mail body
+
 Version 3.0 beta3 (2.93) - 2015/09/26 - SVN r1802
 -------------------------------------------------
 

templates/editform.tpl

@@ -55,7 +55,13 @@
 					{/if}
 				{/if}	
 				</td>
-				<td>{$field.desc}</td>
+				<td>
+					{if $table == 'foo' && $key == 'bar'}
+						Special handling (td content) for {$table} / {$key}
+					{else}
+						{$field.desc}
+					{/if}
+				</td>
 				<td class="error_msg">{$fielderror.{$key}}</td>
 			</tr>
 		{/if}