mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-21 00:12:56 +02:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Dan Poltawski 2012-07-10 09:24:56 +08:00
commit c4f48b552f
2 changed files with 71 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
question/format/gift/format.php
View File

@ -553,8 +553,8 @@ class qformat_gift extends qformat_default {
protected function repchar($text, $notused = 0) {
// Escapes 'reserved' characters # = ~ {) :
// Removes new lines
$reserved = array( '#', '=', '~', '{', '}', ':', "\n", "\r");
$escaped = array('\#','\=','\~','\{','\}','\:', '\n', '' );
$reserved = array( '\\', '#', '=', '~', '{', '}', ':', "\n", "\r");
$escaped = array('\\\\', '\#','\=','\~','\{','\}','\:', '\n', '' );
$newtext = str_replace($reserved, $escaped, $text);
return $newtext;

69
question/format/gift/tests/giftformat_test.php
View File

@ -885,4 +885,73 @@ FALSE#42 is the Ultimate Answer.#You gave the right answer.}";
$this->assert_same_gift($expectedgift, $gift);
}
public function test_export_backslash() {
// There was a bug (MDL-34171) where \\ was getting exported as \\, not
// \\\\, and on import, \\ in converted to \.
// We need \\\\ in the test code, because of PHPs string escaping rules.
$qdata = (object) array(
'id' => 666 ,
'name' => 'backslash',
'questiontext' => 'A \\ B \\\\ C',
'questiontextformat' => FORMAT_MOODLE,
'generalfeedback' => '',
'generalfeedbackformat' => FORMAT_MOODLE,
'defaultmark' => 1,
'penalty' => 0.3333333,
'length' => 1,
'qtype' => 'essay',
'options' => (object) array(
'responseformat' => 'editor',
'responsefieldlines' => 15,
'attachments' => 0,
'graderinfo' => '',
'graderinfoformat' => FORMAT_HTML,
),
);
$exporter = new qformat_gift();
$gift = $exporter->writequestion($qdata);
$expectedgift = "// question: 666 name: backslash
::backslash::A \\\\ B \\\\\\\\ C{}
";
$this->assert_same_gift($expectedgift, $gift);
}
public function test_import_backslash() {
// There was a bug (MDL-34171) where \\ in the import was getting changed
// to \. This test checks for that.
// We need \\\\ in the test code, because of PHPs string escaping rules.
$gift = '
// essay
::double backslash:: A \\\\ B \\\\\\\\ C{}';
$lines = preg_split('/[\\n\\r]/', str_replace("\r\n", "\n", $gift));
$importer = new qformat_gift();
$q = $importer->readquestion($lines);
$expectedq = (object) array(
'name' => 'double backslash',
'questiontext' => 'A \\ B \\\\ C',
'questiontextformat' => FORMAT_MOODLE,
'generalfeedback' => '',
'generalfeedbackformat' => FORMAT_MOODLE,
'qtype' => 'essay',
'defaultmark' => 1,
'penalty' => 0.3333333,
'length' => 1,
'responseformat' => 'editor',
'responsefieldlines' => 15,
'attachments' => 0,
'graderinfo' => array(
'text' => '',
'format' => FORMAT_HTML,
'files' => array()),
);
$this->assert(new question_check_specified_fields_expectation($expectedq), $q);
}
}