Remove MESSAGE_SIDEBAR_ENABLE_USER_ONLINE_MARKING

Close #3330

diff --git a/com.woltlab.wcf/option.xml b/com.woltlab.wcf/option.xml
index 4b09f063639fbeb0674024e5f15d998dfc63fe24..e742a96e200a0e4a03e723027d18aacc3cf83f0b 100644 (file)
--- a/com.woltlab.wcf/option.xml
+++ b/com.woltlab.wcf/option.xml
@@ -1492,12 +1492,6 @@ DESC:wcf.global.sortOrder.descending</selectoptions>
                                <optiontype>boolean</optiontype>
                                <defaultvalue>0</defaultvalue>
                        </option>
-                       <option name="message_sidebar_enable_user_online_marking">
-                               <categoryname>message.sidebar</categoryname>
-                               <optiontype>boolean</optiontype>
-                               <defaultvalue>1</defaultvalue>
-                               <options>module_users_online</options>
-                       </option>
                        <option name="message_sidebar_enable_trophy_points">
                                <categoryname>message.sidebar</categoryname>
                                <optiontype>boolean</optiontype>
@@ -1760,5 +1754,6 @@ DESC:wcf.global.sortOrder.descending</selectoptions>
                <option name="like_allow_for_own_content" />
                <option name="like_enable_dislike" />
                <option name="module_attachment"/>
+               <option name="message_sidebar_enable_user_online_marking"/>
        </delete>
 </data>

diff --git a/com.woltlab.wcf/templates/article.tpl b/com.woltlab.wcf/templates/article.tpl
index 0f116773286d8f026932cf1c0cc14c4e987e2f97..046024892e7662f813dbbf77b0466bde102fb3b1 100644 (file)
--- a/com.woltlab.wcf/templates/article.tpl
+++ b/com.woltlab.wcf/templates/article.tpl
@@ -211,7 +211,7 @@
                                        {event name='afterAboutAuthorText'}
                                        
                                        <div class="articleAboutAuthorUsername">
-                                               <a href="{link controller='User' object=$article->getUserProfile()->getDecoratedObject()}{/link}" class="username userLink" data-user-id="{@$article->getUserProfile()->userID}">{if MESSAGE_SIDEBAR_ENABLE_USER_ONLINE_MARKING}{@$article->getUserProfile()->getFormattedUsername()}{else}{$article->getUserProfile()->username}{/if}</a>
+                                               <a href="{link controller='User' object=$article->getUserProfile()->getDecoratedObject()}{/link}" class="username userLink" data-user-id="{@$article->getUserProfile()->userID}">{@$article->getUserProfile()->getFormattedUsername()}</a>
                                                
                                                {if MODULE_USER_RANK}
                                                        {if $article->getUserProfile()->getUserTitle()}

diff --git a/com.woltlab.wcf/templates/messageSidebar.tpl b/com.woltlab.wcf/templates/messageSidebar.tpl
index 2dda86da1031d448870d81a4553d5ce7c7bbcefd..bdc5f892b122f5ae2e8a1449279f2758da09c48f 100644 (file)
--- a/com.woltlab.wcf/templates/messageSidebar.tpl
+++ b/com.woltlab.wcf/templates/messageSidebar.tpl
@@ -25,7 +25,7 @@
                        
                        <div class="messageAuthorContainer">
                                <a href="{link controller='User' object=$userProfile->getDecoratedObject()}{/link}" class="username userLink" data-user-id="{@$userProfile->userID}"{if $enableMicrodata} itemprop="url"{/if}>
-                                       <span{if $enableMicrodata} itemprop="name"{/if}>{if MESSAGE_SIDEBAR_ENABLE_USER_ONLINE_MARKING}{@$userProfile->getFormattedUsername()}{else}{$username}{/if}</span>
+                                       <span{if $enableMicrodata} itemprop="name"{/if}>{@$userProfile->getFormattedUsername()}</span>
                                </a>
                                {if !$isReply}
                                        {if $userProfile->banned}<span class="icon icon16 fa-lock jsTooltip jsUserBanned" title="{lang user=$userProfile}wcf.user.banned{/lang}"></span>{/if}

diff --git a/wcfsetup/install/files/lib/system/WCF.class.php b/wcfsetup/install/files/lib/system/WCF.class.php
index 1bcc9cde96f7a2162e9f5941b9cacd1a4fa2abdf..a17ee70e6a322d9af857c016d33716906c71873b 100644 (file)
--- a/wcfsetup/install/files/lib/system/WCF.class.php
+++ b/wcfsetup/install/files/lib/system/WCF.class.php
@@ -368,6 +368,10 @@ class WCF {
                define('LIKE_ALLOW_FOR_OWN_CONTENT', 0);
                define('LIKE_ENABLE_DISLIKE', 0);
                
+               // User markings are always applied in sidebars since 5.3.
+               // https://github.com/WoltLab/WCF/issues/3330
+               define('MESSAGE_SIDEBAR_ENABLE_USER_ONLINE_MARKING', 1);
+               
                $filename = WCF_DIR.'options.inc.php';
                
                // create options file if doesn't exist

diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index 5d510f38a9f4d22078a96dae31ac7abd3cdbb5eb..e474d2f8bcd11a6c3306d5a3e221fc98d2726b27 100644 (file)
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -1565,7 +1565,6 @@ GmbH=Gesellschaft mit beschränkter Haftung]]></item>
                <item name="wcf.acp.option.google_maps_default_longitude"><![CDATA[Standard-Kartenposition (Längengrad)]]></item>
                <item name="wcf.acp.option.google_maps_access_user_location"><![CDATA[Aktuelle Benutzerposition verwenden]]></item>
                <item name="wcf.acp.option.google_maps_access_user_location.description"><![CDATA[Bei der Angabe von Positionen wird die aktuelle Position des Benutzers als Ausgangspunkt auf der Karte verwendet.]]></item>
-               <item name="wcf.acp.option.message_sidebar_enable_user_online_marking"><![CDATA[„Benutzer online“-Darstellung für Benutzernamen verwenden]]></item>
                <item name="wcf.acp.option.module_cookie_policy_page"><![CDATA[Erklärung zum „Einsatz von Cookies“ aktivieren]]></item>
                <item name="wcf.acp.option.module_cookie_policy_page.description"><![CDATA[Weist Besucher beim ersten Aufruf der Seite gemäß EU-Richtlinie 2009/136/EG auf den Einsatz von Cookies hin.]]></item>
                <item name="wcf.acp.option.show_update_notice_frontend"><![CDATA[Hinweis bei neuen Updates für Pakete im Frontend anzeigen]]></item>

diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index dd0465612cb87d3fd10ac7e632caefd99e632251..edaa7ef1980724aee71eb5ced79a14afe7de9318 100644 (file)
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -1545,7 +1545,6 @@ ATTENTION: The messages listed above are greatly shortened. You can view details
                <item name="wcf.acp.option.google_maps_default_longitude"><![CDATA[Default Map Position (Longitude)]]></item>
                <item name="wcf.acp.option.google_maps_access_user_location"><![CDATA[Use current user location]]></item>
                <item name="wcf.acp.option.google_maps_access_user_location.description"><![CDATA[When entering a location, the current location of the user is used as start point on the map.]]></item>
-               <item name="wcf.acp.option.message_sidebar_enable_user_online_marking"><![CDATA[Apply the users online marking for usernames]]></item>
                <item name="wcf.acp.option.module_cookie_policy_page"><![CDATA[Enable explanation on cookie usage]]></item>
                <item name="wcf.acp.option.module_cookie_policy_page.description"><![CDATA[Displays a notice on cookie usage according to EU Directive 2009/136/EG upon first visit.]]></item>
                <item name="wcf.acp.option.show_update_notice_frontend"><![CDATA[Display a notice for outstanding updates on the frontend]]></item>