moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 00:46:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-36243' of git://github.com/jmvedrine/moodle

Browse source
This commit is contained in:
Dan Poltawski 2012-12-11 16:24:10 +08:00
commit cba50c0088
7 changed files with 32 additions and 91 deletions
Download patch file Download diff file Expand all files Collapse all files

8
mod/lesson/format.php
View file

@ -366,14 +366,6 @@ class qformat_default {
$newpage->contents = $question->questiontext;
$newpage->contentsformat = isset($question->questionformat) ? $question->questionformat : FORMAT_HTML;
// Sometimes, questiontext is not a simple text, but one array
// containing both text and format, so we need to support here
// that case with the following dirty patch. MDL-35147
if (is_array($question->questiontext)) {
$newpage->contents = isset($question->questiontext['text']) ? $question->questiontext['text'] : '';
$newpage->contentsformat = isset($question->questiontext['format']) ? $question->questiontext['format'] : FORMAT_HTML;
}
// set up page links
if ($pageid) {
// the new page follows on from this page