diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2013-02-13 12:59:30 -0800 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2013-02-13 12:59:30 -0800 |
| commit | e1e77fe3be90563e6389a6a3d1fac7b6028d0bd0 (patch) | |
| tree | 90df67718f91a99ec13c30cf583fd5f438bb749c /settings | |
| parent | 6d7e324f4b97b86199c1e3097a0f9494945f3cb9 (diff) | |
| parent | 9d6f74c65eb51b88e6d93c85a725fbaac2ed8e4a (diff) | |
| download | nextcloud-server-e1e77fe3be90563e6389a6a3d1fac7b6028d0bd0.tar.gz nextcloud-server-e1e77fe3be90563e6389a6a3d1fac7b6028d0bd0.zip | |
Merge pull request #1598 from owncloud/fixing-1424-master
Fixing 1424 master
Diffstat (limited to 'settings')
| -rw-r--r-- | settings/ajax/createuser.php | 6 | ||||
| -rw-r--r-- | settings/js/users.js | 6 |
2 files changed, 0 insertions, 12 deletions
diff --git a/settings/ajax/createuser.php b/settings/ajax/createuser.php index 09ef25d92fa..56653bed6bd 100644 --- a/settings/ajax/createuser.php +++ b/settings/ajax/createuser.php @@ -26,12 +26,6 @@ if(OC_User::isAdminUser(OC_User::getUser())) { $username = $_POST["username"]; $password = $_POST["password"]; -// Does the group exist? -if(OC_User::userExists($username)) { - OC_JSON::error(array("data" => array( "message" => "User already exists" ))); - exit(); -} - // Return Success story try { if (!OC_User::createUser($username, $password)) { diff --git a/settings/js/users.js b/settings/js/users.js index 8b1e32163df..a70cf18ead3 100644 --- a/settings/js/users.js +++ b/settings/js/users.js @@ -346,12 +346,6 @@ $(document).ready(function () { event.preventDefault(); var username = $('#newusername').val(); var password = $('#newuserpassword').val(); - if ($('#content table tbody tr').filterAttr('data-uid', username).length > 0) { - OC.dialogs.alert( - t('settings', 'The username is already being used'), - t('settings', 'Error creating user')); - return; - } if ($.trim(username) == '') { OC.dialogs.alert( t('settings', 'A valid username must be provided'), |