Merge branch '6.0' into 6.1

Author: BurntimeX

docs/tutorial/series/part_2.md

@@ -144,7 +144,7 @@ The code for the table head is similar to the other `th` elements:
 For the table body’s column, we need to make sure that the birthday is only show if it is actually set:
 
 ```smarty
-<td class="columnDate columnBirthday">{if $person->birthday}{$person->birthday|strtotime|date}{/if}</td>
+<td class="columnDate columnBirthday">{if $person->birthday}{$person->birthday}{/if}</td>
 ```
 
 

snippets/tutorial/tutorial-series/part-2/templateListener.xml

@@ -11,7 +11,7 @@
 		<templatelistener name="personListBirthdayColumn">
 			<eventname>columns</eventname>
 			<environment>admin</environment>
-			<templatecode><![CDATA[<td class="columnDate columnBirthday">{if $person->birthday}{$person->birthday|strtotime|date}{/if}</td>]]></templatecode>
+			<templatecode><![CDATA[<td class="columnDate columnBirthday">{if $person->birthday}{$person->birthday}{/if}</td>]]></templatecode>
 			<templatename>personList</templatename>
 		</templatelistener>
 		<!-- /admin -->

snippets/tutorial/tutorial-series/part-2/templates/__personListBirthday.tpl

@@ -1,4 +1,4 @@
 {if $person->birthday}
 	<dt>{lang}wcf.person.birthday{/lang}</dt>
-	<dd>{$person->birthday|strtotime|date}</dd>
+	<dd>{$person->birthday}</dd>
 {/if}