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

Merge remote branch 'origin/master' into rubric

Browse Source
This commit is contained in:
David Mudrak
2011-10-12 03:13:55 +02:00
parent fe817d8799 b77088cd04
commit 6abcb0c21f
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
question/engine/datalib.php
+3 -3
View File
@@ -695,8 +695,8 @@ ORDER BY
DELETE qu, qa, qas, qasd
FROM {question_usages} qu
JOIN {question_attempts} qa ON qa.questionusageid = qu.id
JOIN {question_attempt_steps} qas ON qas.questionattemptid = qa.id
JOIN {question_attempt_step_data} qasd ON qasd.attemptstepid = qas.id
LEFT JOIN {question_attempt_steps} qas ON qas.questionattemptid = qa.id
LEFT JOIN {question_attempt_step_data} qasd ON qasd.attemptstepid = qas.id
WHERE qu.id ' . $qubaids->usage_id_in(),
$qubaids->usage_id_in_params());
}
@@ -713,7 +713,7 @@ ORDER BY
$this->db->execute('
DELETE qas, qasd
FROM {question_attempt_steps} qas
JOIN {question_attempt_step_data} qasd ON qasd.attemptstepid = qas.id
LEFT JOIN {question_attempt_step_data} qasd ON qasd.attemptstepid = qas.id
WHERE qas.questionattemptid ' . $test, $params);
}
version.php
+1 -1
View File
@@ -35,6 +35,6 @@ $version = 2011100700.01; // YYYYMMDD = weekly release date o
// RR = release increments - 00 in DEV branches
// .XX = incremental changes
$release = '2.2dev (Build: 20111007)'; // Human-friendly version name
$release = '2.2dev (Build: 20111009)'; // Human-friendly version name
$maturity = MATURITY_ALPHA; // this version's maturity level