diff options
| author | Tom Needham <tom@owncloud.com> | 2012-12-16 22:29:00 +0000 |
|---|---|---|
| committer | Tom Needham <tom@owncloud.com> | 2012-12-16 22:29:00 +0000 |
| commit | 3c98f36121c10f703904d63cd531b7bbf6ee9454 (patch) | |
| tree | c12c9f737e036cec5f1b235214902473b6b418d5 /settings | |
| parent | 39b51997756ebb233be10ca5a8ced0d6c60d0dac (diff) | |
| parent | 811b571cb3da8494797ed70c5b967067cc2a1b5b (diff) | |
| download | nextcloud-server-3c98f36121c10f703904d63cd531b7bbf6ee9454.tar.gz nextcloud-server-3c98f36121c10f703904d63cd531b7bbf6ee9454.zip | |
Merge branch 'master' into ocs_api
Diffstat (limited to 'settings')
| -rw-r--r-- | settings/ajax/togglegroups.php | 2 | ||||
| -rw-r--r-- | settings/js/users.js | 2 | ||||
| -rw-r--r-- | settings/templates/settings.php | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/settings/ajax/togglegroups.php b/settings/ajax/togglegroups.php index f82ece4aee1..83d455550ae 100644 --- a/settings/ajax/togglegroups.php +++ b/settings/ajax/togglegroups.php @@ -7,7 +7,7 @@ $success = true; $username = $_POST["username"]; $group = $_POST["group"]; -if($username == OC_User::getUser() && $group == "admin" && OC_Group::inGroup($username, 'admin')){ +if($username == OC_User::getUser() && $group == "admin" && OC_Group::inGroup($username, 'admin')) { $l = OC_L10N::get('core'); OC_JSON::error(array( 'data' => array( 'message' => $l->t('Admins can\'t remove themself from the admin group')))); exit(); diff --git a/settings/js/users.js b/settings/js/users.js index f2ce69cf311..f148a43a480 100644 --- a/settings/js/users.js +++ b/settings/js/users.js @@ -64,7 +64,7 @@ var UserList={ } } }); - } + } }, add:function(username, groups, subadmin, quota, sort) { diff --git a/settings/templates/settings.php b/settings/templates/settings.php index 12368a1cdb6..de8092eeaff 100644 --- a/settings/templates/settings.php +++ b/settings/templates/settings.php @@ -6,4 +6,4 @@ <?php foreach($_['forms'] as $form) { echo $form; -};?>
\ No newline at end of file +}; |