Merge branch 'w43_MDL-29921_m22_qti2' of git://github.com/skodak/moodle

moodle · Oct 31, 2011 · c84f470 · c84f470
2 parents ae44df3 + 2dc5461
commit c84f470
Show file tree

Hide file tree

Showing 18 changed files with 1 addition and 2,035 deletions.
diff --git a/lib/pluginlib.php b/lib/pluginlib.php
@@ -385,7 +385,7 @@ public static function standard_plugins_list($type) {
 
             'qformat' => array(
                 'aiken', 'blackboard', 'blackboard_six', 'examview', 'gift',
-                'learnwise', 'missingword', 'multianswer', 'qti_two', 'webct',
+                'learnwise', 'missingword', 'multianswer', 'webct',
                 'xhtml', 'xml'
             ),
 

diff --git a/mod/quiz/lang/en/quiz.php b/mod/quiz/lang/en/quiz.php
@@ -514,7 +514,6 @@
 $string['qname'] = 'name';
 $string['qbrief'] = 'Q. {$a}';
 $string['qti'] = 'IMS QTI format';
-$string['qti_two'] = 'IMS QTI 2.0 format';
 $string['qtypename'] = 'type, name';
 $string['question'] = 'Question';
 $string['questionbankcontents'] = 'Question bank contents';

diff --git a/question/format/qti_two/custommediafilter.php b/question/format/qti_two/custommediafilter.php