MDL-33624 lang - remove incosistent use of placeholder

diff --git a/blog/index.php b/blog/index.php
index 77476a9..c008427 100644 (file)
--- a/blog/index.php
+++ b/blog/index.php
@@ -143,7 +143,7 @@ if (!empty($groupid)) {
     }
 
     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);

diff --git a/course/delete.php b/course/delete.php
index ba9c3be..ebe6b78 100644 (file)
--- a/course/delete.php
+++ b/course/delete.php
@@ -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);

diff --git a/course/externallib.php b/course/externallib.php
index 41c5ab4..bf43d2b 100644 (file)
--- a/course/externallib.php
+++ b/course/externallib.php
@@ -722,7 +722,7 @@ class core_course_external extends external_api {
         // Context validation.
 
         if (! ($course = $DB->get_record('course', array('id'=>$params['courseid'])))) {
-            throw new moodle_exception('invalidcourseid', 'error', '', $params['courseid']);
+            throw new moodle_exception('invalidcourseid', 'error');
         }
 
         // Category where duplicated course is going to be created.

diff --git a/enrol/authorize/index.php b/enrol/authorize/index.php
index 5bdee18..7b93b04 100644 (file)
--- a/enrol/authorize/index.php
+++ b/enrol/authorize/index.php
@@ -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

diff --git a/lang/en/error.php b/lang/en/error.php
index b40859b..7ad032c 100644 (file)
--- a/lang/en/error.php
+++ b/lang/en/error.php
@@ -280,7 +280,7 @@ $string['invalidcomponent'] = 'Invalid component name';
 $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';

diff --git a/mod/data/export.php b/mod/data/export.php
index 3040ef6..40fc894 100644 (file)
--- a/mod/data/export.php
+++ b/mod/data/export.php
@@ -41,7 +41,7 @@ if (! $cm = get_coursemodule_from_instance('data', $data->id, $data->course)) {
 }
 
 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

diff --git a/notes/externallib.php b/notes/externallib.php
index fc31e9b..f671042 100644 (file)
--- a/notes/externallib.php
+++ b/notes/externallib.php
@@ -110,7 +110,7 @@ class core_notes_external extends external_api {
             //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']);