diff options
| author | Jan-Hendrik Willms <tleilax+studip@gmail.com> | 2025-05-19 09:41:23 +0200 |
|---|---|---|
| committer | Jan-Hendrik Willms <tleilax+studip@gmail.com> | 2025-05-19 09:41:23 +0200 |
| commit | 34577a2a0bd594a10106eec13c2328c70b1867ee (patch) | |
| tree | 818b3cfab2e4c309ff19a3a7f3ac72d9c9d6bde9 /app/controllers | |
| parent | 6b2ec2a25459ee69465fa8dff052353e1fce2bc3 (diff) | |
strictly separate wysiwyg and display content, fixes #5604, fixes #5608issue-4710
Closes #5604 and #5608
Merge request studip/studip!4232
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/course/wiki.php | 1 | ||||
| -rw-r--r-- | app/controllers/jsupdater.php | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/app/controllers/course/wiki.php b/app/controllers/course/wiki.php index fb4431f..83d3f3f 100644 --- a/app/controllers/course/wiki.php +++ b/app/controllers/course/wiki.php @@ -492,6 +492,7 @@ class Course_WikiController extends AuthenticatedController 'editing' => (bool) $online_user->editing, 'enable-autosave' => $user->getConfiguration()->getValue('WIKI_ENABLE_AUTOSAVE'), 'page-content' => $page->content, + 'page-html' => wikiReady($page->content, true, $page->range_id, $page->id), 'page-id' => (int) $page->id, 'save-url' => $this->saveURL($page), 'users' => $page->getOnlineUsers(), diff --git a/app/controllers/jsupdater.php b/app/controllers/jsupdater.php index bde2059..ab52c32 100644 --- a/app/controllers/jsupdater.php +++ b/app/controllers/jsupdater.php @@ -327,8 +327,8 @@ class JsupdaterController extends AuthenticatedController $page->isReadable() && $page->chdate >= Request::int('server_timestamp') ) { - $data['content'] = wikiReady($page->content, true, $page->range_id, $page->id); - $data['wysiwyg'] = $page->content; + $data['html'] = wikiReady($page->content, true, $page->range_id, $page->id); + $data['content'] = $page->content; $data['chdate'] = date('c', $page->chdate); } |