fixed content translation handling during upgrade

zikula-modules · Sep 23, 2018 · c8d8632 · c8d8632
1 parent 70e4a23
commit c8d8632
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/modules/Zikula/ContentModule/ContentModuleInstaller.php b/src/modules/Zikula/ContentModule/ContentModuleInstaller.php
@@ -289,12 +289,13 @@ public function upgrade($oldVersion)
                     WHERE `transc_cid` = " . intval($oldContentItemId) . "
                 ");
                 while ($transRow = $transStmt->fetch()) {
-                    $contentData = @unserialize($row['transc_data']);
+                    $contentData = @unserialize($transRow['transc_data']);
                     if ($contentData) {
-                        $contentData = array_merge($item->getContentData(), $contentData);
+                        $contentData = $contentData + $item->getContentData();
                         $item->setContentData($contentData);
+                        $contentType = $contentDisplayHelper->initContentType($item);
+                        $item->setSearchText($contentType->getSearchableText());
                     }
-
                     $item->setLocale($transRow['transc_lang']);
                     $this->entityManager->flush($item);
                 }