Merge branch 'MDL-49611' of git://github.com/srynot4sale/moodle-fixes

robjoyce · May 27, 2015 · 1bd2c8a · 1bd2c8a
2 parents 777cb3e + 03f3f71
commit 1bd2c8a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/blocks/completionstatus/details.php b/blocks/completionstatus/details.php
@@ -133,7 +133,7 @@
     echo html_writer::start_tag('tr');
     echo html_writer::start_tag('td', array('colspan' => '2'));
     echo html_writer::start_tag('br');
-    echo $OUTPUT->box(get_string('err_nocriteria', 'completion'), 'noticebox');
+    echo $OUTPUT->box(get_string('nocriteriaset', 'completion'), 'noticebox');
     echo html_writer::end_tag('td');
     echo html_writer::end_tag('tr');
     echo html_writer::end_tag('tbody');

diff --git a/completion/classes/external.php b/completion/classes/external.php
@@ -301,7 +301,7 @@ public static function get_course_completion_status($courseid, $userid) {
 
         $completions = $info->get_completions($user->id);
         if (empty($completions)) {
-            throw new moodle_exception('err_nocriteria', 'completion');
+            throw new moodle_exception('nocriteriaset', 'completion');
         }
 
         // Load course completion.

diff --git a/report/completion/index.php b/report/completion/index.php
@@ -91,7 +91,7 @@
 $completion = new completion_info($course);
 
 if (!$completion->has_criteria()) {
-    print_error('err_nocriteria', 'completion', $CFG->wwwroot.'/course/report.php?id='.$course->id);
+    print_error('nocriteriaset', 'completion', $CFG->wwwroot.'/course/report.php?id='.$course->id);
 }
 
 // Get criteria and put in correct order