From d359b67ab95a01f0cc38608f5ea4adb33405b5f0 Mon Sep 17 00:00:00 2001
From: Kyle Browning <kylebrowning@me.com>
Date: Tue, 14 Jan 2014 17:30:46 -0800
Subject: [PATCH] Issue [#1853592]

---
 resources/user_resource.inc                     |  2 +-
 tests/functional/ServicesResourceUserTests.test | 20 ++++++++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/resources/user_resource.inc b/resources/user_resource.inc
index 40c9401..3350370 100644
--- a/resources/user_resource.inc
+++ b/resources/user_resource.inc
@@ -369,7 +369,7 @@ function _user_resource_update($uid, $account) {
   }
 
   // If user is changing name, make sure they have permission.
-  if (isset($account['name']) && $account['name'] != $account_loaded->name && !(user_access('change own username') || !user_access('administer users'))) {
+  if (isset($account['name']) && $account['name'] != $account_loaded->name && !(user_access('change own username') || user_access('administer users'))) {
     return services_error(t('You are not allowed to change your username.'), 406);
   }
 
diff --git a/tests/functional/ServicesResourceUserTests.test b/tests/functional/ServicesResourceUserTests.test
index e00d710..7f336da 100644
--- a/tests/functional/ServicesResourceUserTests.test
+++ b/tests/functional/ServicesResourceUserTests.test
@@ -166,7 +166,27 @@ class ServicesResourceUsertests extends ServicesWebtestCase {
                         && ($account->roles = $this->privileged_user->roles);
     $this->assertTrue($users_are_the_same, 'Retrieved user is the same as created.', 'UserResource: Retrieve');
   }
+  /**
+   * Test updateing a username with administer users permission #1853592.
+   *
+   * Create user, update email.
+   */
+  function testUpdateUserName() {
+    // Create user.
+    $account = $this->drupalCreateUser();
+	$name = $this->randomName();
+    // Update mail of the user.
+    $updated_account = array(
+      'name' => $name,
+    );
+    $response = $this->servicesPut($this->endpoint->path . '/user/' . $account->uid, $updated_account);
 
+    $user_load = user_load($account->uid);
+    $this->assertEqual($name, $user_load->name,
+      'You are allowed to change a username as administer users perm.',
+      'User Resource : Test to check for drupal.org issue #1853592');
+  }
+  
   /**
    * Test update method.
    *
-- 
1.8.3.4 (Apple Git-47)