From: Marcel Werk <burntime@woltlab.com>
Date: Tue, 23 Aug 2016 20:17:13 +0000 (+0200)
Subject: Hide obsolete activation notice in redirects
X-Git-Tag: 3.0.0_Beta_1~546
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=3160b2ff8d93d33d51088175615801661eb5caa2;p=GitHub%2FWoltLab%2FWCF.git

Hide obsolete activation notice in redirects
---

diff --git a/com.woltlab.wcf/templates/userNotice.tpl b/com.woltlab.wcf/templates/userNotice.tpl
index 53c011e81a..3a70bea188 100644
--- a/com.woltlab.wcf/templates/userNotice.tpl
+++ b/com.woltlab.wcf/templates/userNotice.tpl
@@ -10,7 +10,7 @@
 		<p class="info">{lang}wcf.page.availableUpdates{/lang}</p>
 	{/if}
 	
-	{if $__wcf->user->activationCode && REGISTER_ACTIVATION_METHOD == 1 && $templateName != 'registerActivation'}
+	{if $__wcf->user->activationCode && REGISTER_ACTIVATION_METHOD == 1 && $templateName != 'registerActivation' && $templateName != 'register' && $templateName != 'redirect'}
 		<p class="warning">{lang}wcf.user.register.needActivation{/lang}</p>
 	{/if}