Merge branch 'master' into next

diff --cc com.woltlab.wcf/templates/boxPaidSubscriptions.tpl
index a5ecf3aeb339c1b8a48e34dff04bc7d3903fcc6f,d69355227f01171160e02781223e327d10b2897d..0b6e68da1767f04cd69c957102eafcddb229427f
--- 1/com.woltlab.wcf/templates/boxPaidSubscriptions.tpl
--- 2/com.woltlab.wcf/templates/boxPaidSubscriptions.tpl
+++ b/com.woltlab.wcf/templates/boxPaidSubscriptions.tpl
@@@ -1,8 -1,8 +1,8 @@@
  <ul class="containerBoxList tripleColumned">
        {foreach from=$subscriptions item=subscription}
                <li>
-                       <div class="containerHeadline" title="{$subscription->description|language}">
+                       <div class="containerHeadline">
 -                              <h3>{$subscription->title|language}</h3>
 +                              <h3>{$subscription->getTitle()}</h3>
                                <small>{lang}wcf.paidSubscription.formattedCost{/lang}</small>
                        </div>
                        

diff --cc com.woltlab.wcf/templates/boxPaidSubscriptionsSidebar.tpl
index 15d3696670c01cf5f6f618bdb3b1b6bf3eaa4a17,f5efc026532988989ddf282a36714384c21db689..5fbe460af4f12ce35188fe5bd5f58df557ac51df
--- 1/com.woltlab.wcf/templates/boxPaidSubscriptionsSidebar.tpl
--- 2/com.woltlab.wcf/templates/boxPaidSubscriptionsSidebar.tpl
+++ b/com.woltlab.wcf/templates/boxPaidSubscriptionsSidebar.tpl
@@@ -1,8 -1,8 +1,8 @@@
  <ul class="sidebarItemList">
        {foreach from=$subscriptions item=subscription}
                <li>
-                       <div class="sidebarItemTitle" title="{$subscription->description|language}">
+                       <div class="sidebarItemTitle">
 -                              <h3>{$subscription->title|language}</h3>
 +                              <h3>{$subscription->getTitle()}</h3>
                                <small>{lang}wcf.paidSubscription.formattedCost{/lang}</small>
                        </div>
                        
@@@ -17,6 -17,6 +17,6 @@@
        {/foreach}
  </ul>
  
 -{if PAID_SUBSCRIPTION_ENABLE_TOS_CONFIRMATION}
 +{if PAID_SUBSCRIPTION_ENABLE_TOS_CONFIRMATION && $__wcf->user->canPurchasePaidSubscriptions()}
        <a class="button small more" href="{link controller='PaidSubscriptionList'}{/link}">{lang}wcf.paidSubscription.button.moreInformation{/lang}</a>
- {/if}
+ {/if}

diff --cc wcfsetup/install/files/lib/acp/form/StyleAddForm.class.php
Simple merge

diff --cc wcfsetup/install/files/lib/acp/form/StyleEditForm.class.php
Simple merge

diff --cc wcfsetup/install/files/lib/system/cache/builder/RoutingCacheBuilder.class.php
Simple merge

diff --cc wcfsetup/install/lang/de.xml
Simple merge

diff --cc wcfsetup/install/lang/en.xml
Simple merge