set editor data from `content.content` and HTML from `content.html`, fixes #6097

Closes #6097

Merge request studip/studip!4635

2 files changed, 8 insertions, 8 deletions

diff --git a/app/controllers/jsupdater.php b/app/controllers/jsupdater.php
index 60c75d7..e3fab75 100644
--- a/app/controllers/jsupdater.php
+++ b/app/controllers/jsupdater.php
@@ -330,7 +330,7 @@ class JsupdaterController extends AuthenticatedController
                     && $page->chdate >= Request::int('server_timestamp')
                 ) {
                     $data['html'] = wikiReady($page->content, true, $page->range_id, $page->id);
-                    $data['content'] = $page->content;
+                    $data['content'] = Studip\Markup::markupToHtml($page->content);
                     $data['chdate'] = date('c', $page->chdate);
                 }
 
diff --git a/resources/vue/apps/WikiEditor.vue b/resources/vue/apps/WikiEditor.vue
index dda34ba..5e0c350 100644
--- a/resources/vue/apps/WikiEditor.vue
+++ b/resources/vue/apps/WikiEditor.vue
@@ -255,20 +255,20 @@ export default {
         JSUpdater.register(
             'wiki_editor_status',
             (content) => {
-                this.onlineUsers = content.users;
-                this.isEditing = content.editing;
-
                 if ('chdate' in content) {
                     this.lastSaveDate = new Date(content.chdate);
                 }
 
-                if ('content' in content) {
-                    this.html = content.content;
+                if ('html' in content) {
+                    this.html = content.html;
                 }
 
-                if (!this.isEditing && 'wysiwyg' in content) {
-                    this.editor.setData(content.wysiwyg);
+                if (!this.isEditing && 'content' in content) {
+                    this.editor.setData(content.content);
                 }
+
+                this.onlineUsers = content.users;
+                this.isEditing = content.editing;
             },
             () => this.getUpdaterData()
         );