From b7a4701d1f57cb13a4f47c3fae20ff5897079fbb Mon Sep 17 00:00:00 2001
From: Sam Hemelryk <sam@moodle.com>
Date: Mon, 9 Sep 2013 12:15:59 +1200
Subject: [PATCH] MDL-41417 course: fixed idnumbertaken string

---
 course/edit_form.php            | 2 +-
 course/lib.php                  | 2 +-
 course/tests/courselib_test.php | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/course/edit_form.php b/course/edit_form.php
index 373e149baff..225e3d307d5 100644
--- a/course/edit_form.php
+++ b/course/edit_form.php
@@ -343,7 +343,7 @@ class course_edit_form extends moodleform {
         if (!empty($data['idnumber']) && (empty($data['id']) || $this->course->idnumber != $data['idnumber'])) {
             if ($course = $DB->get_record('course', array('idnumber' => $data['idnumber']), '*', IGNORE_MULTIPLE)) {
                 if (empty($data['id']) || $course->id != $data['id']) {
-                    $errors['idnumber'] = get_string('courseidnumbertaken', 'error', $course->fullname);
+                    $errors['idnumber'] = get_string('idnumbertaken', 'error');
                 }
             }
         }
diff --git a/course/lib.php b/course/lib.php
index bdb14936dcb..a3f5d9aefd6 100644
--- a/course/lib.php
+++ b/course/lib.php
@@ -3972,7 +3972,7 @@ function update_course($data, $editoroptions = NULL) {
     // Check we don't have a duplicate idnumber.
     if (!empty($data->idnumber) && $oldcourse->idnumber != $data->idnumber) {
         if ($DB->record_exists('course', array('idnumber' => $data->idnumber))) {
-            throw new moodle_exception('courseidnumbertaken', '', '', $data->idnumber);
+            throw new moodle_exception('idnumbertaken', 'error');
         }
     }
 
diff --git a/course/tests/courselib_test.php b/course/tests/courselib_test.php
index 9d167bfa060..542c0f8ffa6 100644
--- a/course/tests/courselib_test.php
+++ b/course/tests/courselib_test.php
@@ -130,7 +130,7 @@ class courselib_testcase extends advanced_testcase {
             update_course($created2);
             $this->fail('Expected exception when trying to update a course with duplicate idnumber');
         } catch (moodle_exception $e) {
-            $this->assertEquals(get_string('courseidnumbertaken', 'error', $created2->idnumber), $e->getMessage());
+            $this->assertEquals(get_string('idnumbertaken', 'error'), $e->getMessage());
         }
 
         // Test duplicate shortname.