Merge branch 's11_MDL-27999_wiki_preview_master' of github.com:dongsheng/moodle

This commit is contained in:
Eloy Lafuente (stronk7) 2011-06-24 00:13:48 +02:00
commit 4965f02087

View file

@ -1013,7 +1013,7 @@ class page_wiki_preview extends page_wiki_edit {
$parseroutput = wiki_parse_content($data->contentformat, $text, $options); $parseroutput = wiki_parse_content($data->contentformat, $text, $options);
$this->set_newcontent($text); $this->set_newcontent($text);
echo $OUTPUT->notification(get_string('previewwarning', 'wiki'), 'notifyproblem wiki_info'); echo $OUTPUT->notification(get_string('previewwarning', 'wiki'), 'notifyproblem wiki_info');
$content = format_text($parseroutput['parsed_text'], FORMAT_HTML, array('overflowdiv'=>true)); $content = format_text($parseroutput['parsed_text'], FORMAT_HTML, array('overflowdiv'=>true, 'filter'=>false));
echo $OUTPUT->box($content, 'generalbox wiki_previewbox'); echo $OUTPUT->box($content, 'generalbox wiki_previewbox');
$content = $this->newcontent; $content = $this->newcontent;
} }