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

Merge branch 'MDL-28049' of git://github.com/timhunt/moodle

Browse source
This commit is contained in:
Eloy Lafuente (stronk7) 2011-06-27 15:56:03 +02:00
commit 3bdc10150c
2 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
question/format/xml/format.php
View file

@ -27,6 +27,14 @@
defined('MOODLE_INTERNAL') || die(); defined('MOODLE_INTERNAL') || die();
require_once($CFG->libdir . '/xmlize.php'); require_once($CFG->libdir . '/xmlize.php');
if (!class_exists('qformat_default')) {
// This is ugly, but this class is also (ab)used by mod/lesson, which defines
// a different base class in mod/lesson/format.php. Thefore, we can only
// include the proper base class conditionally like this. (We have to include
// the base class like this, otherwise it breaks third-party question types.)
// This may be reviewd, and a better fix found one day.
require_once($CFG->dirroot . '/question/format.php');
}
/** /**

1
question/format/xml/simpletest/testxmlformat.php
View file

@ -27,7 +27,6 @@
defined('MOODLE_INTERNAL') || die(); defined('MOODLE_INTERNAL') || die();
require_once($CFG->libdir . '/questionlib.php'); require_once($CFG->libdir . '/questionlib.php');
require_once($CFG->dirroot . '/question/format.php');
require_once($CFG->dirroot . '/question/format/xml/format.php'); require_once($CFG->dirroot . '/question/format/xml/format.php');