Merge branch '6.1' into 6.2

Author: dtdesign

com.woltlab.wcf/box.xml

@@ -3,7 +3,7 @@
 	<import>
 		<box identifier="com.woltlab.wcf.RecentActivity">
 			<name language="de">Letzte Aktivitäten</name>
-			<name language="en">Recent Activities</name>
+			<name language="en">Recent Activity</name>
 			<boxType>system</boxType>
 			<position>contentBottom</position>
 			<objectType>com.woltlab.wcf.recentActivityList</objectType>
@@ -16,7 +16,7 @@
 				<title>Letzte Aktivitäten</title>
 			</content>
 			<content language="en">
-				<title>Recent Activities</title>
+				<title>Recent Activity</title>
 			</content>
 		</box>
 		<box identifier="com.woltlab.wcf.RegisterButton">

com.woltlab.wcf/menuItem.xml

@@ -34,7 +34,7 @@
 		<item identifier="com.woltlab.wcf.RecentActivityList">
 			<parent>com.woltlab.wcf.MembersList</parent>
 			<title language="de">Letzte Aktivitäten</title>
-			<title language="en">Recent Activities</title>
+			<title language="en">Recent Activity</title>
 			<page>com.woltlab.wcf.RecentActivityList</page>
 		</item>
 		<item identifier="com.woltlab.wcf.UsersOnlineList">

com.woltlab.wcf/page.xml

@@ -20,10 +20,10 @@
 			<pageType>system</pageType>
 			<controller>wcf\page\RecentActivityListPage</controller>
 			<name language="de">Letzte Aktivitäten</name>
-			<name language="en">Recent Activities</name>
+			<name language="en">Recent Activity</name>
 			<parent>com.woltlab.wcf.MembersList</parent>
 			<content language="en">
-				<title>Recent Activities</title>
+				<title>Recent Activity</title>
 			</content>
 			<content language="de">
 				<title>Letzte Aktivitäten</title>

…oltlab.wcf/templates/spoilerMetaCode.tpl …wcf/templates/shared_spoilerMetaCode.tplcom.woltlab.wcf/templates/spoilerMetaCode.tpl renamed to com.woltlab.wcf/templates/shared_spoilerMetaCode.tpl com.woltlab.wcf/templates/spoilerMetaCode.tpl renamed to com.woltlab.wcf/templates/shared_spoilerMetaCode.tpl

@@ -131,6 +131,7 @@
     '__multiPageCondition' => 'shared_multiPageCondition',
     '__multilineItemListFormField' => 'shared_multilineItemListFormField',
     'imageViewer' => 'shared_imageViewer',
+    'spoilerMetaCode' => 'shared_spoilerMetaCode',
 ];
 if ($argc !== 2) {
     echo "ERROR: Expected a single argument to the directory that should be used to recursively replace template includes.\n";

extra/migrate-shared-template.php

@@ -129,7 +129,7 @@ private function validatePassword(PasswordFormField $formField): void
             $formField->addValidationError(
                 new FormFieldValidationError(
                     'notSecure',
-                    'wcf.user.newPassword.error.notSecure'
+                    'wcf.user.password.error.notSecure'
                 )
             );
         }

wcfsetup/install/files/lib/form/NewPasswordForm.class.php

@@ -130,7 +130,7 @@ class WysiwygFormContainer extends FormContainer
      * is `true` if smilies are supported for this container, otherwise `false`
      * @var bool
      */
-    protected $supportSmilies = true;
+    protected $supportSmilies = \MODULE_SMILEY;
 
     /**
      * actual wysiwyg form field
@@ -674,10 +674,6 @@ public function supportQuotes($supportQuotes = true)
      */
     public function supportSmilies($supportSmilies = true)
     {
-        if (!\MODULE_SMILEY) {
-            $supportSmilies = false;
-        }
-
         if ($this->smiliesContainer !== null) {
             $this->smiliesContainer->available($supportSmilies);
         } else {

wcfsetup/install/files/lib/system/form/builder/container/wysiwyg/WysiwygFormContainer.class.php

@@ -55,7 +55,7 @@ public function process(array $elements, AbstractHtmlNodeProcessor $htmlNodeProc
      */
     public function replaceTag(array $data)
     {
-        return WCF::getTPL()->render('wcf', 'spoilerMetaCode', [
+        return WCF::getTPL()->render('wcf', 'shared_spoilerMetaCode', [
             'buttonLabel' => $data['label'],
             'spoilerID' => \substr(StringUtil::getRandomID(), 0, 8),
         ]);

wcfsetup/install/files/lib/system/html/output/node/HtmlOutputNodeWoltlabSpoiler.class.php

@@ -122,6 +122,7 @@ class TemplateEngine extends SingletonFactory
         'radioButtonSearchableOptionType' => 'shared_radioButtonSearchableOptionType',
         'recaptcha' => 'shared_recaptcha',
         'scrollablePageCheckboxList' => 'shared_scrollablePageCheckboxList',
+        'spoilerMetaCode' => 'shared_spoilerMetaCode',
         'sitemapEnd' => 'shared_sitemapEnd',
         'sitemapEntry' => 'shared_sitemapEntry',
         'sitemapIndex' => 'shared_sitemapIndex',

wcfsetup/install/files/lib/system/template/TemplateEngine.class.php

@@ -128,7 +128,6 @@ public function getEventHash()
     public function checkAccess()
     {
         if (!ViewableArticleRuntimeCache::getInstance()->getObject($this->getUserNotificationObject()->objectID)->canRead()) {
-            UserStorageHandler::getInstance()->reset([WCF::getUser()->userID], 'wbbUnreadWatchedThreads');
             UserStorageHandler::getInstance()->reset([WCF::getUser()->userID], 'unreadArticles');
             UserStorageHandler::getInstance()->reset([WCF::getUser()->userID], 'unreadWatchedArticles');
             UserStorageHandler::getInstance()->reset([WCF::getUser()->userID], 'unreadArticlesByCategory');