Merge branch 'MDL-31392_22' of git://github.com/timhunt/moodle into M…

…OODLE_22_STABLE
moodle · Jan 30, 2012 · c8a11c7 · c8a11c7
2 parents 17b629d + e2a4d8f
commit c8a11c7
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/question/engine/upgrade/upgradelib.php b/question/engine/upgrade/upgradelib.php
@@ -88,8 +88,9 @@ protected function get_quiz_ids() {
         global $CFG, $DB;
 
         // Look to see if the admin has set things up to only upgrade certain attempts.
-        $partialupgradefile = $CFG->dirroot . '/local/qeupgradehelper/partialupgrade.php';
+        $partialupgradefile = $CFG->dirroot . '/' . $CFG->admin .
-        $partialupgradefunction = 'local_qeupgradehelper_get_quizzes_to_upgrade';
+                '/tool/qeupgradehelper/partialupgrade.php';
+        $partialupgradefunction = 'tool_qeupgradehelper_get_quizzes_to_upgrade';
         if (is_readable($partialupgradefile)) {
             include_once($partialupgradefile);
             if (function_exists($partialupgradefunction)) {