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

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

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7)
2011-10-25 01:53:51 +02:00
parent dc83f5b006 deef04a44e
commit 9bfe68bff8
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
question/engine/datalib.php
+11 -10
View File
@@ -111,7 +111,7 @@ class question_engine_data_mapper {
$record = new stdClass();
$record->questionattemptid = $questionattemptid;
$record->sequencenumber = $seq;
$record->state = '' . $step->get_state();
$record->state = (string) $step->get_state();
$record->fraction = $step->get_fraction();
$record->timecreated = $step->get_timecreated();
$record->userid = $step->get_user_id();
@@ -505,14 +505,14 @@ $sqlorderby
}
list($statetest, $stateparams) = $this->db->get_in_or_equal(array(
question_state::$gaveup,
question_state::$gradedwrong,
question_state::$gradedpartial,
question_state::$gradedright,
question_state::$mangaveup,
question_state::$mangrwrong,
question_state::$mangrpartial,
question_state::$mangrright), SQL_PARAMS_NAMED, 'st');
(string) question_state::$gaveup,
(string) question_state::$gradedwrong,
(string) question_state::$gradedpartial,
(string) question_state::$gradedright,
(string) question_state::$mangaveup,
(string) question_state::$mangrwrong,
(string) question_state::$mangrpartial,
(string) question_state::$mangrright), SQL_PARAMS_NAMED, 'st');
return $this->db->get_records_sql("
SELECT
@@ -818,7 +818,8 @@ ORDER BY
*/
public function in_summary_state_test($summarystate, $equal = true, $prefix = 'summarystates') {
$states = question_state::get_all_for_summary_state($summarystate);
return $this->db->get_in_or_equal($states, SQL_PARAMS_NAMED, $prefix, $equal);
return $this->db->get_in_or_equal(array_map('strval', $states),
SQL_PARAMS_NAMED, $prefix, $equal);
}
/**