Permalink
Browse files

Merge branch 'MDL-33624-22' of git://github.com/danpoltawski/moodle i…

…nto MOODLE_22_STABLE
  • Loading branch information...
Sam Hemelryk
Sam Hemelryk committed Jul 16, 2012
2 parents 3c0d5ff + b872235 commit f1cb47f9a38ec2a5cb193d86479f3afb5c57a9c7
Showing with 7 additions and 7 deletions.
  1. +1 −1 blog/index.php
  2. +2 −2 course/delete.php
  3. +1 −1 enrol/authorize/index.php
  4. +1 −1 lang/en/error.php
  5. +1 −1 mod/data/export.php
  6. +1 −1 notes/externallib.php
View
@@ -143,7 +143,7 @@
}
if (!$course = $DB->get_record('course', array('id'=>$group->courseid))) {
- print_error(get_string('invalidcourseid', 'blog'));
+ print_error('invalidcourseid');
}
$coursecontext = get_context_instance(CONTEXT_COURSE, $course->id);
View
@@ -18,11 +18,11 @@
$strcategories = get_string("categories");
if (! $course = $DB->get_record("course", array("id"=>$id))) {
- print_error("invalidcourseid", 'error', '', $id);
+ print_error("invalidcourseid");
}
if ($site->id == $course->id) {
// can not delete frontpage!
- print_error("invalidcourseid", 'error', '', $id);
+ print_error("invalidcourseid");
}
$coursecontext = get_context_instance(CONTEXT_COURSE, $course->id);
@@ -53,7 +53,7 @@
/// Get course
if (!($course = $DB->get_record('course', array('id'=>$courseid)))) {
- print_error('invalidcourseid', '', '', $courseid);
+ print_error('invalidcourseid');
}
/// Only SITE users can access to this page
View
@@ -273,7 +273,7 @@
$string['invalidconfirmdata'] = 'Invalid confirmation data';
$string['invalidcontext'] = 'Invalid context';
$string['invalidcourse'] = 'Invalid course';
-$string['invalidcourseid'] = 'You are trying to use an invalid course ID: ({$a})';
+$string['invalidcourseid'] = 'You are trying to use an invalid course ID';
$string['invalidcourselevel'] = 'Incorrect context level';
$string['invalidcoursemodule'] = 'Invalid course module ID';
$string['invalidcoursenameshort'] = 'Invalid short course name';
View
@@ -41,7 +41,7 @@
}
if(! $course = $DB->get_record('course', array('id'=>$cm->course))) {
- print_error('invalidcourseid', '', '', $cm->course);
+ print_error('invalidcourseid');
}
// fill in missing properties needed for updating of instance
View
@@ -95,7 +95,7 @@ public static function create_notes($notes = array()) {
//check the course exists
if (empty($courses[$note['courseid']])) {
$success = false;
- $errormessage = get_string('invalidcourseid', 'notes', $note['courseid']);
+ $errormessage = get_string('invalidcourseid', 'error');
} else {
// Ensure the current user is allowed to run this function
$context = get_context_instance(CONTEXT_COURSE, $note['courseid']);

0 comments on commit f1cb47f

Please sign in to comment.