Skip to content

Commit e832137

Browse files
authored
Merge pull request #6661 from WoltLab/63-article-refactoring
Refactor article forms, pages and dbo
2 parents 6b15945 + 0f1db1b commit e832137

73 files changed

Lines changed: 1865 additions & 2991 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/objectType.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,11 @@
171171
<definitionname>com.woltlab.wcf.attachment.objectType</definitionname>
172172
<classname>wcf\system\attachment\ArticleAttachmentObjectType</classname>
173173
</type>
174+
<type>
175+
<name>com.woltlab.wcf.article.content</name>
176+
<definitionname>com.woltlab.wcf.attachment.objectType</definitionname>
177+
<classname>wcf\system\attachment\ArticleAttachmentObjectType</classname>
178+
</type>
174179
<type>
175180
<name>com.woltlab.wcf.comment</name>
176181
<definitionname>com.woltlab.wcf.message</definitionname>

com.woltlab.wcf/templates/article.tpl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
{capture assign='headContent'}
2222
{if $article->isMultilingual}
23-
{foreach from=$article->getLanguageLinks() item='langArticleContent'}
23+
{foreach from=$article->getArticleContents() item='langArticleContent'}
2424
{if $langArticleContent->getLanguage()}
2525
<link rel="alternate" hreflang="{$langArticleContent->getLanguage()->languageCode}" href="{$langArticleContent->getLink()}">
2626
{/if}
@@ -38,7 +38,7 @@
3838
<span>{$articleContent->getLanguage()->languageName}</span>
3939
</button>
4040
<ul class="dropdownMenu">
41-
{foreach from=$article->getLanguageLinks() item='langArticleContent'}
41+
{foreach from=$article->getArticleContents() item='langArticleContent'}
4242
{if $langArticleContent->getLanguage()}
4343
<li class="boxFlag">
4444
<a class="box24" href="{$langArticleContent->getLink()}">
@@ -116,7 +116,7 @@
116116

117117
{include file='entryTags' objectType='com.woltlab.wcf.article'}
118118

119-
{include file='entryAttachments' objectID=$article->articleID}
119+
{include file='entryAttachments' attachments=$articleContent->getAttachments()}
120120

121121
<footer class="entry__footer">
122122
{if MODULE_LIKE && ARTICLE_ENABLE_LIKE && $__wcf->session->getPermission('user.like.canViewLike')}

0 commit comments

Comments
 (0)