Merge branch 'MDL-49379_master' of git://github.com/markn86/moodle

2015-03-04 10:46:18 +01:00
parent 553319be03 05536ad165
commit de2f05d50d
1 changed files with 2 additions and 2 deletions
@@ -158,8 +158,8 @@ class external_service_form extends moodleform {
        $errors = parent::validation($data, $files);

        // Add field validation check for duplicate name.
-        if (!empty($data['name'])) {
-            if ($DB->record_exists('external_services', array('name' => $data['name']))) {
+        if ($webservice = $DB->get_record('external_services', array('name' => $data['name']))) {
+            if (empty($data['id']) || $webservice->id != $data['id']) {
                $errors['name'] = get_string('nameexists', 'webservice');
            }
        }