Propagate content language to embedded objects in articles

Author: BurntimeX

wcfsetup/install/files/lib/data/TCollectionEmbeddedObjects.class.php

@@ -31,10 +31,22 @@ public function loadEmbeddedObjects(string $messageObjectType): void
 
         MessageEmbeddedObjectManager::getInstance()->loadObjects(
             $messageObjectType,
-            $objectIDs
+            $objectIDs,
+            $this->getContentLanguageID(),
         );
     }
 
+    protected function getContentLanguageID(): ?int
+    {
+        return null;
+    }
+
+    protected function hasEmbeddedObjects(DatabaseObject $object): bool
+    {
+        // @phpstan-ignore property.notFound
+        return $object->hasEmbeddedObjects === 1;
+    }
+
     /**
      * @return int[]
      */
@@ -44,7 +56,7 @@ private function getEmbeddedObjectIDs(): array
 
         return \array_map(
             static fn(DatabaseObject $object) => $object->getObjectID(),
-            \array_filter($this->getObjects(), fn(DatabaseObject $object) => $object->hasEmbeddedObjects === 1)
+            \array_filter($this->getObjects(), fn(DatabaseObject $object) => $this->hasEmbeddedObjects($object))
         );
     }
 }

wcfsetup/install/files/lib/data/article/Article.class.php

@@ -63,6 +63,7 @@ class Article extends CollectionDatabaseObject implements ILinkableObject, IPopo
     const DELAYED_PUBLICATION = 2;
 
     protected int $effectiveVisitTime;
+    protected int $activeLanguageID;
 
     /**
      * Returns true if the active user can delete this article.
@@ -480,6 +481,26 @@ public function getEffectiveVisitTime(): int
         return $this->effectiveVisitTime;
     }
 
+    /**
+     * @since 6.3
+     */
+    public function setActiveLanguageID(int $languageID): void
+    {
+        $this->activeLanguageID = $languageID;
+    }
+
+    /**
+     * @since 6.3
+     */
+    public function getActiveLanguageID(): ?int
+    {
+        if (isset($this->activeLanguageID)) {
+            return $this->activeLanguageID;
+        }
+
+        return null;
+    }
+
     /**
      * Returns the number of unread articles.
      *

wcfsetup/install/files/lib/data/article/ArticleCollection.class.php

@@ -44,12 +44,12 @@ public function getArticleContent(Article $article): ?ArticleContent
     {
         $this->loadArticleContents();
 
-        /*if (
-            $file->getActiveLanguageID() !== null
-            && isset($this->fileContents[$file->getObjectID()][$file->getActiveLanguageID()])
+        if (
+            $article->getActiveLanguageID() !== null
+            && isset($this->articleContents[$article->getObjectID()][$article->getActiveLanguageID()])
         ) {
-            return $this->fileContents[$file->getObjectID()][$file->getActiveLanguageID()];
-        }*/
+            return $this->articleContents[$article->getObjectID()][$article->getActiveLanguageID()];
+        }
         if (isset($this->articleContents[$article->getObjectID()][WCF::getLanguage()->languageID])) {
             return $this->articleContents[$article->getObjectID()][WCF::getLanguage()->languageID];
         }

wcfsetup/install/files/lib/data/article/content/ArticleContentCollection.class.php

@@ -57,7 +57,7 @@ private function loadImages(): void
         $this->images = $mediaList->getObjects();
     }
 
-    private function getContentLanguageID(): ?int
+    protected function getContentLanguageID(): ?int
     {
         $objects = $this->getObjects();
         if (\count($objects) === 1) {

wcfsetup/install/files/lib/page/ArticlePage.class.php

@@ -70,7 +70,11 @@ public function readParameters(): void
             throw new PermissionDeniedException();
         }
 
-        // update interface language
+        if ($this->articleContent->languageID !== null) {
+            $this->article->setActiveLanguageID($this->articleContent->languageID);
+        }
+
+        // update interface language to match the article's language
         if (
             WCF::getUser()->isGuest()
             && $this->article->isMultilingual

wcfsetup/install/files/lib/system/endpoint/controller/core/articles/contents/GetArticleContentHeaderTitle.class.php

@@ -33,6 +33,10 @@ public function __invoke(ServerRequestInterface $request, array $variables): Res
 
         $articleContent->getArticle()->getDiscussionProvider()->setArticleContent($articleContent);
 
+        if ($articleContent->languageID !== null) {
+            $articleContent->getArticle()->setActiveLanguageID($articleContent->languageID);
+        }
+
         return new JsonResponse([
             'template' => WCF::getTPL()->render('wcf', 'articleContentHeaderTitle', [
                 'articleContent' => $articleContent,

wcfsetup/install/files/lib/system/message/embedded/object/ArticleMessageEmbeddedObjectHandler.class.php

@@ -4,7 +4,6 @@
 
 use wcf\data\article\AccessibleArticleList;
 use wcf\data\article\Article;
-use wcf\system\cache\runtime\ArticleRuntimeCache;
 use wcf\system\html\input\HtmlInputProcessor;
 
 /**
@@ -32,7 +31,19 @@ public function parse(HtmlInputProcessor $htmlInputProcessor, array $embeddedDat
     #[\Override]
     public function loadObjects(array $objectIDs)
     {
-        return ArticleRuntimeCache::getInstance()->getObjects($objectIDs);
+        $objectList = new AccessibleArticleList();
+        $objectList->setObjectIDs($objectIDs);
+        $objectList->readObjects();
+        $articles = $objectList->getObjects();
+
+        $contentLanguageID = MessageEmbeddedObjectManager::getInstance()->getContentLanguageID();
+        if ($contentLanguageID !== null) {
+            foreach ($articles as $article) {
+                $article->setActiveLanguageID($contentLanguageID);
+            }
+        }
+
+        return $articles;
     }
 
     #[\Override]