commit 38d52d320439b9f90494552075547441574e225b
Author: Botond Hegedus <botondhegedus.webdeveloper@gmail.com>
Date:   Tue Feb 17 18:48:40 2015 +0000

    MDL-49198 core_webservice: Fix error when using existing service name

diff --git a/admin/webservice/forms.php b/admin/webservice/forms.php
index ce1202b..9440d93 100644
--- a/admin/webservice/forms.php
+++ b/admin/webservice/forms.php
@@ -160,8 +160,8 @@ class external_service_form extends moodleform {
         // Add field validation check for duplicate name.
         // Name field is required, can not be empty.
         if (!empty($data['name'])) {
-            if ($service = $DB->get_record('external_services', array('name' => $data['name']), '*', IGNORE_MISSING)) {
-                $errors['name'] = get_string('nametaken', 'webservice', $service->name);
+            if ($DB->record_exists('external_services', array('name' => $data['name']))) {
+                $errors['name'] = get_string('nameexists', 'webservice');
             }
         }
 
diff --git a/lang/en/webservice.php b/lang/en/webservice.php
index c88a6ca..836d21e 100644
--- a/lang/en/webservice.php
+++ b/lang/en/webservice.php
@@ -127,7 +127,7 @@ $string['missingusername'] = 'Missing username';
 $string['missingversionfile'] = 'Coding error: version.php file is missing for the component {$a}';
 $string['mobilewsdisabled'] = 'Disabled';
 $string['mobilewsenabled'] = 'Enabled';
-$string['nametaken'] = 'Service name is already used for another service ({$a})';
+$string['nameexists'] = 'This name is already in use by another service';
 $string['nocapabilitytouseparameter'] = 'The user does not have the required capability to use the parameter {$a}';
 $string['nofunctions'] = 'This service has no functions.';
 $string['norequiredcapability'] = 'No required capability';