L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-20636 Merge remote-tracking branch 'moodle/master' into upgrade

Browse Source 
Conflicts:
	lib/filestorage/file_storage.php
	mod/quiz/attemptlib.php
	mod/quiz/lib.php
	mod/quiz/mod_form.php
	mod/quiz/report/overview/overview_table.php
	mod/quiz/report/overview/report.php
	mod/quiz/report/responses/report.php
	mod/quiz/report/responses/responses_table.php
	mod/quiz/report/statistics/db/install.xml
	mod/quiz/report/statistics/qstats.php
	mod/quiz/report/statistics/report.php
	mod/quiz/report/statistics/statistics_question_table.php
	mod/quiz/report/statistics/statistics_table.php
	mod/quiz/report/statistics/version.php
	mod/quiz/review.php
	mod/quiz/reviewquestion.php
	mod/quiz/startattempt.php
	mod/quiz/styles.css
	mod/quiz/view.php
	question/type/essay/questiontype.php
	question/type/match/backup/moodle2/backup_qtype_match_plugin.class.php
	question/type/match/backup/moodle2/restore_qtype_match_plugin.class.php
	question/type/numerical/display.html
	question/type/numerical/questiontype.php
	question/type/questiontype.php
	question/type/random/questiontype.php
	question/type/shortanswer/questiontype.php
	theme/base/style/question.css
This commit is contained in:
Tim Hunt
2011-05-11 20:29:49 +01:00
parent fca599a683 de584990c6
commit a2ac234956
1225 changed files with 22803 additions and 8568 deletions
Download Patch File Download Diff File Expand all files Collapse all files
question/engine/simpletest/testdatalib.php
+7 -7
View File
@@ -64,8 +64,8 @@ class qubaid_condition_test extends UnitTestCase {
$this->check_typical_question_attempts_query($qubaids,
"SELECT qa.id, qa.maxmark
FROM {question_attempts} qa
WHERE qa.questionusageid = :qubaid0000 AND qa.slot = :slot",
array('qubaid0000' => 1, 'slot' => 1));
WHERE qa.questionusageid = :qubaid8 AND qa.slot = :slot",
array('qubaid8' => 1, 'slot' => 1));
}
public function test_qubaid_list_several_join() {
@@ -73,8 +73,8 @@ class qubaid_condition_test extends UnitTestCase {
$this->check_typical_question_attempts_query($qubaids,
"SELECT qa.id, qa.maxmark
FROM {question_attempts} qa
WHERE qa.questionusageid IN (:qubaid0000,:qubaid0001,:qubaid0002) AND qa.slot = :slot",
array('qubaid0000' => 1, 'qubaid0001' => 3, 'qubaid0002' => 7, 'slot' => 1));
WHERE qa.questionusageid IN (:qubaid12,:qubaid13,:qubaid14) AND qa.slot = :slot",
array('qubaid12' => 1, 'qubaid13' => 3, 'qubaid14' => 7, 'slot' => 1));
}
public function test_qubaid_join() {
@@ -103,7 +103,7 @@ class qubaid_condition_test extends UnitTestCase {
$this->check_typical_in_query($qubaids,
"SELECT qa.id, qa.maxmark
FROM {question_attempts} qa
WHERE qa.questionusageid = :qubaid0000", array('qubaid0000' => 1));
WHERE qa.questionusageid = :qubaid15", array('qubaid15' => 1));
}
public function test_qubaid_list_several_in() {
@@ -112,8 +112,8 @@ class qubaid_condition_test extends UnitTestCase {
$this->check_typical_in_query($qubaids,
"SELECT qa.id, qa.maxmark
FROM {question_attempts} qa
WHERE qa.questionusageid IN (:qubaid0000,:qubaid0001,:qubaid0002)",
array('qubaid0000' => 1, 'qubaid0001' => 2, 'qubaid0002' => 3));
WHERE qa.questionusageid IN (:qubaid16,:qubaid17,:qubaid18)",
array('qubaid16' => 1, 'qubaid17' => 2, 'qubaid18' => 3));
}
public function test_qubaid_join_in() {