diff options
| author | Bart Visscher <bartv@thisnet.nl> | 2012-10-27 11:58:02 +0200 |
|---|---|---|
| committer | Bart Visscher <bartv@thisnet.nl> | 2012-10-27 11:58:02 +0200 |
| commit | 0120f3fd629e772d9a7493e5289c1d6708ba92d5 (patch) | |
| tree | dbee6eba6d11afe887a6235375119b7a6bd71b69 /settings/js | |
| parent | 74665faec533430be37879bfc0ef24aa7f211f6e (diff) | |
| parent | beaaf5425dc2dfb7456efa934fa8eb91ac28c677 (diff) | |
| download | nextcloud-server-0120f3fd629e772d9a7493e5289c1d6708ba92d5.tar.gz nextcloud-server-0120f3fd629e772d9a7493e5289c1d6708ba92d5.zip | |
Merge branch 'routing'
Conflicts:
core/lostpassword/index.php
core/lostpassword/resetpassword.php
Diffstat (limited to 'settings/js')
| -rw-r--r-- | settings/js/users.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/settings/js/users.js b/settings/js/users.js index 20bd94993bc..1474ebcdd81 100644 --- a/settings/js/users.js +++ b/settings/js/users.js @@ -130,7 +130,7 @@ var UserList={ if (typeof UserList.offset === 'undefined') { UserList.offset = $('tbody tr').length; } - $.get(OC.filePath('settings', 'ajax', 'userlist.php'), { offset: UserList.offset }, function(result) { + $.get(OC.Router.generate('settings_ajax_userlist', { offset: UserList.offset }), function(result) { if (result.status === 'success') { $.each(result.data, function(index, user) { var tr = UserList.add(user.name, user.groups, user.subadmin, user.quota, false); |