From: Matthias Schmidt <gravatronics@live.com>
Date: Fri, 13 Jul 2012 14:17:21 +0000 (+0200)
Subject: Merge branch 'refs/heads/master' into enhancement/categoryLangVar
X-Git-Tag: 2.0.0_Beta_1~1000^2
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=f9c2704ed8d2894e90b76228d5f3f41194cfacb0;p=GitHub%2FWoltLab%2FWCF.git

Merge branch 'refs/heads/master' into enhancement/categoryLangVar

Conflicts:
	wcfsetup/install/files/acp/templates/categoryAdd.tpl
---

f9c2704ed8d2894e90b76228d5f3f41194cfacb0
diff --cc wcfsetup/install/files/acp/templates/categoryAdd.tpl
index 417ca25c69,ebfa4e4fc3..3c6d35943a
--- a/wcfsetup/install/files/acp/templates/categoryAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/categoryAdd.tpl
@@@ -54,7 -59,7 +54,7 @@@
  <form method="post" action="{if $action == 'add'}{link controller=$addController}{/link}{else}{link controller=$editController id=$category->categoryID title=$category->getTitle()}{/link}{/if}">
  	<div class="container containerPadding marginTop shadow">
  		<fieldset>
- 			<legend>{@$objectType->getProcessor()->getLanguageVariable('data')}</legend>
 -			<legend>{hascontent}{content}{lang __optional=true}{@$objectType->getProcessor()->getLangVarPrefix()}.data{/lang}{/content}{hascontentelse}{lang}wcf.global.form.data{/lang}{/hascontent}</legend>
++			<legend>{lang}wcf.global.form.data{/lang}</legend>
  			
  			{if $categoryNodeList|count}
  				<dl{if $errorField == 'parentCategoryID'} class="formError"{/if}>