diff options
| author | Michael Gapczynski <GapczynskiM@gmail.com> | 2011-07-30 19:40:19 -0400 |
|---|---|---|
| committer | Michael Gapczynski <GapczynskiM@gmail.com> | 2011-07-30 19:40:19 -0400 |
| commit | 11d162751381963e0c8a86cf15c811cc99003654 (patch) | |
| tree | 276b5b1e67a66491ef553346087b2959f35b3bc7 /apps/files_sharing/ajax/userautocomplete.php | |
| parent | d13ba0ee2d93080ba56776442b9d39a53e2b6321 (diff) | |
| parent | d6faa89ed720da7319923cba33a83d0210216d57 (diff) | |
| download | nextcloud-server-11d162751381963e0c8a86cf15c811cc99003654.tar.gz nextcloud-server-11d162751381963e0c8a86cf15c811cc99003654.zip | |
Merge branch 'master' into sharing. Integrate with changes in master, rename classes
Conflicts:
lib/base.php
Diffstat (limited to 'apps/files_sharing/ajax/userautocomplete.php')
| -rw-r--r-- | apps/files_sharing/ajax/userautocomplete.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/files_sharing/ajax/userautocomplete.php b/apps/files_sharing/ajax/userautocomplete.php index 6e1469ae348..816e01ba9ee 100644 --- a/apps/files_sharing/ajax/userautocomplete.php +++ b/apps/files_sharing/ajax/userautocomplete.php @@ -3,7 +3,7 @@ $RUNTIME_NOAPPS = true; require_once('../../../lib/base.php'); -if (!OC_USER::isLoggedIn()) { +if (!OC_User::isLoggedIn()) { echo json_encode(array("status" => "error", "data" => array("message" => "Authentication error"))); exit(); } @@ -11,8 +11,8 @@ $query = $_GET['term']; $length = strlen($query); $query = strtolower($query); $users = array(); -$ocusers = OC_USER::getUsers(); -$self = OC_USER::getUser(); +$ocusers = OC_User::getUsers(); +$self = OC_User::getUser(); $groups = OC_GROUP::getUserGroups($self); foreach ($ocusers as $user) { if ($user != $self && substr(strtolower($user), 0, $length) == $query) { |