Permalink
Browse files

MDL-34225 course completion : moved criteria classes into criteria su…

…bdir
  • Loading branch information...
1 parent 7534234 commit 60829d80944616c9babf0625e8b0cd08ae6dde17 @nebgor nebgor committed Jul 10, 2012
@@ -172,7 +172,7 @@ public static function factory($params) {
}
$class = 'completion_criteria_'.$COMPLETION_CRITERIA_TYPES[$params['criteriatype']];
- require_once($CFG->dirroot.'/completion/'.$class.'.php');
+ require_once($CFG->dirroot.'/completion/criteria/'.$class.'.php');
return new $class($params, false);
}
View
@@ -207,7 +207,7 @@ function completion_cron_criteria() {
foreach ($COMPLETION_CRITERIA_TYPES as $type) {
$object = 'completion_criteria_'.$type;
- require_once 'completion/'.$object.'.php';
+ require_once $CFG->dirroot.'/completion/criteria/'.$object.'.php';
$class = new $object();
View
@@ -28,14 +28,14 @@
require_once('../config.php');
require_once('lib.php');
require_once($CFG->libdir.'/completionlib.php');
-require_once($CFG->dirroot.'/completion/completion_criteria_self.php');
-require_once($CFG->dirroot.'/completion/completion_criteria_date.php');
-require_once($CFG->dirroot.'/completion/completion_criteria_unenrol.php');
-require_once($CFG->dirroot.'/completion/completion_criteria_activity.php');
-require_once($CFG->dirroot.'/completion/completion_criteria_duration.php');
-require_once($CFG->dirroot.'/completion/completion_criteria_grade.php');
-require_once($CFG->dirroot.'/completion/completion_criteria_role.php');
-require_once($CFG->dirroot.'/completion/completion_criteria_course.php');
+require_once($CFG->dirroot.'/completion/criteria/completion_criteria_self.php');
+require_once($CFG->dirroot.'/completion/criteria/completion_criteria_date.php');
+require_once($CFG->dirroot.'/completion/criteria/completion_criteria_unenrol.php');
+require_once($CFG->dirroot.'/completion/criteria/completion_criteria_activity.php');
+require_once($CFG->dirroot.'/completion/criteria/completion_criteria_duration.php');
+require_once($CFG->dirroot.'/completion/criteria/completion_criteria_grade.php');
+require_once($CFG->dirroot.'/completion/criteria/completion_criteria_role.php');
+require_once($CFG->dirroot.'/completion/criteria/completion_criteria_course.php');
require_once $CFG->libdir.'/gradelib.php';
require_once('completion_form.php');
View
@@ -32,7 +32,7 @@
* Include the required completion libraries
*/
require_once $CFG->dirroot.'/completion/completion_aggregation.php';
-require_once $CFG->dirroot.'/completion/completion_criteria.php';
+require_once $CFG->dirroot.'/completion/criteria/completion_criteria.php';
require_once $CFG->dirroot.'/completion/completion_completion.php';
require_once $CFG->dirroot.'/completion/completion_criteria_completion.php';
View
@@ -405,7 +405,7 @@ function xmldb_main_upgrade($oldversion) {
}
if ($oldversion < 2012042300.02) {
- require_once($CFG->dirroot.'/completion/completion_criteria.php');
+ require_once($CFG->dirroot.'/completion/criteria/completion_criteria.php');
// Delete orphaned criteria which were left when modules were removed
if ($DB->get_dbfamily() === 'mysql') {
$sql = "DELETE cc FROM {course_completion_criteria} cc

0 comments on commit 60829d8

Please sign in to comment.