Skip to content

Commit c638ecb

Browse files
dtdesigndtdesign
committed
Merge branch '6.2' into 6.3
2 parents 9ef41f1 + e212507 commit c638ecb

52 files changed

Lines changed: 262 additions & 331 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎com.woltlab.wcf/package.xml‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
<packagedescription>Free CMS and web-framework, designed for awesome websites and communities.</packagedescription>
66
<packagedescription language="de">Freies CMS und Web-Framework, das eindrucksvolle Websites und Communities ermöglicht.</packagedescription>
77
<isapplication>1</isapplication>
8-
<version>6.2.0 RC 4</version>
9-
<date>2026-02-05</date>
8+
<version>6.2.1 dev 1</version>
9+
<date>2026-03-02</date>
1010
</packageinformation>
1111

1212
<authorinformation>
@@ -98,11 +98,10 @@ tar cvf com.woltlab.wcf/files_pre_check.tar -C wcfsetup/install/files/ \
9898
<instruction type="script">acp/update_com.woltlab.wcf_6.2_cleanUpDsStore.php</instruction>
9999
</instructions>
100100

101-
<instructions type="update" fromversion="6.2.0 RC 3">
101+
<instructions type="update" fromversion="6.2.0">
102+
<instruction type="acpTemplate">acptemplates_update.tar</instruction>
102103
<instruction type="file">files_update.tar</instruction>
103104
<instruction type="template">templates_update.tar</instruction>
104-
<instruction type="script">acp/update_com.woltlab.wcf_6.2_cleanUpDsStore.php</instruction>
105105
<instruction type="language"/>
106-
<instruction type="userGroupOption"/>
107106
</instructions>
108107
</package>

‎com.woltlab.wcf/templates/attachments.tpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
{foreach from=$attachmentList->getGroupedObjects($objectID) item=attachment}
99
{if $attachment->showAsImage() && !$attachment->isEmbedded()}
1010
<li class="attachmentThumbnail" data-attachment-id="{$attachment->attachmentID}">
11-
<a href="{$attachment->getLink()}"{if $attachment->canDownload()} data-type="image" data-fancybox="message-{$attachmentList->getObjectTypeName()}-{$objectID}" data-caption="{$attachment->filename}" aria-title="{lang}wcf.attachment.image.title{/lang}"{/if}>
11+
<a href="{$attachment->getLink()}"{if $attachment->canDownload()} data-type="image" data-fancybox="message-{$attachmentList->getObjectTypeName()}-{$objectID}" data-caption="{$attachment->filename}" aria-label="{lang}wcf.attachment.image.title{/lang}"{/if}>
1212
<div class="attachmentThumbnailContainer">
1313
<span class="attachmentThumbnailImage">
1414
{if $attachment->hasThumbnail()}

‎com.woltlab.wcf/templates/boxArticleList.tpl‎

Lines changed: 38 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -1,72 +1,40 @@
1-
{if $boxPosition === 'sidebarLeft' || $boxPosition === 'sidebarRight'}
2-
<ul class="sidebarList">
3-
{foreach from=$boxArticleList item=boxArticle}
4-
<li class="sidebarListItem">
5-
<div class="sidebarListItem__image">
6-
{unsafe:$boxArticle->getUserProfile()->getAvatar()->getImageTag(24)}
7-
</div>
1+
<ul class="sidebarList">
2+
{foreach from=$boxArticleList item=boxArticle}
3+
<li class="sidebarListItem">
4+
<div class="sidebarListItem__image">
5+
{unsafe:$boxArticle->getUserProfile()->getAvatar()->getImageTag(24)}
6+
</div>
87

9-
<div class="sidebarListItem__content">
10-
<h3 class="sidebarListItem__title">
11-
{anchor object=$boxArticle class='articleLink sidebarListItem__link' title=$boxArticle->getTitle()}
12-
</h3>
13-
</div>
8+
<div class="sidebarListItem__content">
9+
<h3 class="sidebarListItem__title">
10+
{anchor object=$boxArticle class='articleLink sidebarListItem__link' title=$boxArticle->getTitle()}
11+
</h3>
12+
</div>
1413

15-
<div class="sidebarListItem__meta">
16-
{if $boxSortField === 'time'}
17-
<div class="sidebarListItem__meta__item sidebarListItem__meta__author">
18-
{unsafe:$boxArticle->getUserProfile()->getFormattedUsername()}
19-
</div>
20-
<div class="sidebarListItem__meta__item sidebarListItem__meta__time">
21-
{time time=$boxArticle->time}
22-
</div>
23-
{elseif $boxSortField === 'views'}
24-
<div class="sidebarListItem__meta__item sidebarListItem__meta__views">
25-
{lang article=$boxArticle}wcf.article.articleViews{/lang}
26-
</div>
27-
{elseif $boxSortField === 'comments'}
28-
<div class="sidebarListItem__meta__item sidebarListItem__meta__comments">
29-
{$boxArticle->getDiscussionProvider()->getDiscussionCountPhrase()}
30-
</div>
31-
{elseif $boxSortField === 'cumulativeLikes'}
32-
<div class="sidebarListItem__meta__item sidebarListItem__meta__reactions">
33-
{if MODULE_LIKE && $__wcf->getSession()->getPermission('user.like.canViewLike') && $boxArticle->cachedReactions}
34-
{include file='shared_topReaction' cachedReactions=$boxArticle->cachedReactions render='full'}
35-
{/if}
36-
</div>
37-
{/if}
38-
</div>
39-
</li>
40-
{/foreach}
41-
</ul>
42-
{else}
43-
<ul class="articleList">
44-
{foreach from=$boxArticleList item=boxArticle}
45-
<li>
46-
<a href="{$boxArticle->getLink()}">
47-
{if $boxArticle->getTeaserImage() && $boxArticle->getTeaserImage()->hasThumbnail('small')}
48-
<div class="articleListImage">{unsafe:$boxArticle->getTeaserImage()->getThumbnailTag('small')}</div>
49-
{else}
50-
<div class="articleListImage">
51-
<img src="{$__wcf->getStyleHandler()->getStyle()->getCoverPhotoURL()}" alt=""
52-
style="height: {$__wcf->getStyleHandler()->getStyle()->getCoverPhotoHeight()}px; width: {$__wcf->getStyleHandler()->getStyle()->getCoverPhotoWidth()}px">
53-
</div>
54-
{/if}
55-
56-
<h3 class="articleListTitle">{$boxArticle->getTitle()}</h3>
57-
<ul class="inlineList articleListMetaData">
58-
<li>
59-
{icon name='clock'}
60-
{time time=$boxArticle->time}
61-
</li>
62-
63-
<li>
64-
{icon name='comments'}
65-
{$boxArticle->getDiscussionProvider()->getDiscussionCountPhrase()}
66-
</li>
67-
</ul>
68-
</a>
69-
</li>
70-
{/foreach}
71-
</ul>
72-
{/if}
14+
<div class="sidebarListItem__meta">
15+
{if $boxSortField === 'time'}
16+
<div class="sidebarListItem__meta__item sidebarListItem__meta__author">
17+
{unsafe:$boxArticle->getUserProfile()->getFormattedUsername()}
18+
</div>
19+
<div class="sidebarListItem__meta__item sidebarListItem__meta__time">
20+
{time time=$boxArticle->time}
21+
</div>
22+
{elseif $boxSortField === 'views'}
23+
<div class="sidebarListItem__meta__item sidebarListItem__meta__views">
24+
{lang article=$boxArticle}wcf.article.articleViews{/lang}
25+
</div>
26+
{elseif $boxSortField === 'comments'}
27+
<div class="sidebarListItem__meta__item sidebarListItem__meta__comments">
28+
{$boxArticle->getDiscussionProvider()->getDiscussionCountPhrase()}
29+
</div>
30+
{elseif $boxSortField === 'cumulativeLikes'}
31+
<div class="sidebarListItem__meta__item sidebarListItem__meta__reactions">
32+
{if MODULE_LIKE && $__wcf->getSession()->getPermission('user.like.canViewLike') && $boxArticle->cachedReactions}
33+
{include file='shared_topReaction' cachedReactions=$boxArticle->cachedReactions render='full'}
34+
{/if}
35+
</div>
36+
{/if}
37+
</div>
38+
</li>
39+
{/foreach}
40+
</ul>

‎com.woltlab.wcf/templates/commentResponseList.tpl‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
{unsafe:$__wcf->getReactionHandler()->getDataAttributes('com.woltlab.wcf.comment.response', $response->responseID)}
1010
data-can-edit="{if $response->isEditable()}true{else}false{/if}"
1111
data-can-delete="{if $response->isDeletable()}true{else}false{/if}"
12-
data-user-id="{$response->userID}"
1312
>
1413
<woltlab-core-comment-response class="commentResponse" response-id="{$response->responseID}" itemprop="comment" itemscope itemtype="http://schema.org/Comment">
1514
<div class="commentResponse__header">

‎com.woltlab.wcf/templates/entryAttachments.tpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
{foreach from=$attachmentList->getGroupedObjects($objectID) item=attachment}
99
{if $attachment->showAsImage() && !$attachment->isEmbedded()}
1010
<li class="attachmentThumbnail" data-attachment-id="{$attachment->attachmentID}">
11-
<a href="{$attachment->getLink()}"{if $attachment->canDownload()} data-type="image" data-fancybox="message-{$attachmentList->getObjectTypeName()}-{$objectID}" data-caption="{$attachment->filename}" aria-title="{lang}wcf.attachment.image.title{/lang}"{/if}>
11+
<a href="{$attachment->getLink()}"{if $attachment->canDownload()} data-type="image" data-fancybox="message-{$attachmentList->getObjectTypeName()}-{$objectID}" data-caption="{$attachment->filename}" aria-label="{lang}wcf.attachment.image.title{/lang}"{/if}>
1212
<div class="attachmentThumbnailContainer">
1313
<span class="attachmentThumbnailImage">
1414
{if $attachment->hasThumbnail()}

‎com.woltlab.wcf/templates/paidSubscriptionList.tpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
</script>
1919

2020
<noscript>
21-
<style type="text/css">
21+
<style>
2222
.paidSubscriptionList button {
2323
display: none;
2424
}

‎com.woltlab.wcf/templates/shared_tabTabMenuFormContainer.tpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<ul>
77
{foreach from=$container item='child'}
88
{if $child->isAvailable()}
9-
<li{if !$child->checkDependencies()} style="display: none;"{/if}><a{if $container->usesAnchors()} href="#{$child->getPrefixedId()|rawurlencode}Container"{/if}>{unsafe:$child->getLabel()}</a></li>
9+
<li data-name="{$child->getPrefixedId()}"{if !$child->checkDependencies()} style="display: none;"{/if}><a{if $container->usesAnchors()} href="#{$child->getPrefixedId()|rawurlencode}Container"{/if}>{unsafe:$child->getLabel()}</a></li>
1010
{/if}
1111
{/foreach}
1212
</ul>

‎com.woltlab.wcf/templates/user.tpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
</script>
6868

6969
<noscript>
70-
<style type="text/css">
70+
<style>
7171
#profileContent > .tabMenu > ul > li:not(:first-child) {
7272
display: none !important;
7373
}

‎com.woltlab.wcf/templates/userProfileHeader.tpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
>
2222
<div class="userProfileHeader__coverPhotoContainer">
2323
<div class="userProfileHeader__coverPhoto">
24-
<img src="{$view->user->getCoverPhoto()->getURL()}" data-object-id="{$view->user->getCoverPhoto()->getObjectID()}" class="userProfileHeader__coverPhotoImage">
24+
<img src="{$view->user->getCoverPhoto()->getURL()}" data-object-id="{$view->user->getCoverPhoto()->getObjectID()}" class="userProfileHeader__coverPhotoImage" alt="">
2525
</div>
2626

2727
<div class="userProfileHeader__manageButtons">

‎constants.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -225,6 +225,7 @@
225225
\define('URL_UNFURLING_SAVE_IMAGES', 1);
226226
\define('SERVICE_WORKER_PRIVATE_KEY', '');
227227
\define('SERVICE_WORKER_PUBLIC_KEY', '');
228+
\define('RECAPTCHA_PUBLICKEY_V3', '');
228229
\define('RECAPTCHA_PRIVATEKEY_V3', '');
229230
\define('IMAGE_CONVERT_FORMAT', 'webp');
230231
\define('IMAGE_STRIP_EXIF', 1);

0 commit comments

Comments
 (0)