Merge branch 'wip-MDL-28463-m24' of git://github.com/marinaglancy/moodle into MOODLE_24_STABLE

This commit is contained in:
Damyon Wiese
2013-11-01 22:53:01 +08:00
+4 -2
View File
@@ -1139,10 +1139,12 @@ abstract class condition_info_base {
private function get_cached_grade_score($gradeitemid, $grabthelot=false, $userid=0) {
global $USER, $DB, $SESSION;
if ($userid==0 || $userid==$USER->id) {
// For current user, go via cache in session
if (empty($SESSION->gradescorecache) || $SESSION->gradescorecacheuserid!=$USER->id) {
// For current user, go via cache in session. Force reset it every 10 minutes.
if (empty($SESSION->gradescorecache) || $SESSION->gradescorecacheuserid!=$USER->id
|| !isset($SESSION->gradescorecachereset) || $SESSION->gradescorecachereset+600<time()) {
$SESSION->gradescorecache = array();
$SESSION->gradescorecacheuserid = $USER->id;
$SESSION->gradescorecachereset = time();
}
if (!array_key_exists($gradeitemid, $SESSION->gradescorecache)) {
if ($grabthelot) {