aboutsummaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
Diffstat (limited to 'app')
-rw-r--r--app/controllers/course/wiki.php1
-rw-r--r--app/controllers/jsupdater.php4
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);
}