Merge branch 'wip-MDL-43021-m25' of git://github.com/marinaglancy/moo…

…dle into MOODLE_25_STABLE
moodle · Apr 7, 2014 · 547f695 · 547f695
2 parents 19fd2cb + 68f41b2
commit 547f695
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/course/lib.php b/course/lib.php
@@ -2377,14 +2377,14 @@ function update_course($data, $editoroptions = NULL) {
 
     // Check we don't have a duplicate shortname.
     if (!empty($data->shortname) && $oldcourse->shortname != $data->shortname) {
-        if ($DB->record_exists('course', array('shortname' => $data->shortname))) {
+        if ($DB->record_exists_sql('SELECT id from {course} WHERE shortname = ? AND id <> ?', array($data->shortname, $data->id))) {
             throw new moodle_exception('shortnametaken', '', '', $data->shortname);
         }
     }
 
     // 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))) {
+        if ($DB->record_exists_sql('SELECT id from {course} WHERE idnumber = ? AND id <> ?', array($data->idnumber, $data->id))) {
             throw new moodle_exception('idnumbertaken', 'error');
         }
     }