small fixes / cleanup

diff --git a/lib/private/group/metadata.php b/lib/private/group/metadata.php
index 65444cc04e82c5514f15d7efa07b776adcf115ec..a901ccdce325da5277928fff02d2d4fc0d5f99a5 100644 (file)
--- a/lib/private/group/metadata.php
+++ b/lib/private/group/metadata.php
@@ -81,9 +81,8 @@ class MetaData {
                $sortAdminGroupsKeys = array();
 
                foreach($this->getGroups($search) as $group) {
-                       $usersInGroup = $group->count();
                        $groupMetaData = $this->generateGroupMetaData($group);
-                       if (strtolower($gid) !== 'admin') {
+                       if (strtolower($group->getGID()) !== 'admin') {
                                $this->addEntry(
                                        $groups,
                                        $sortGroupsKeys,

diff --git a/lib/private/user/user.php b/lib/private/user/user.php
index 86a362ae758e62bb85d5d16ca51f916a23f6edb9..ddef3b7adf12f4d70eb9c54e3c716b8a9c5f4c69 100644 (file)
--- a/lib/private/user/user.php
+++ b/lib/private/user/user.php
@@ -53,7 +53,7 @@ class User {
        private $config;
 
        /**
-        * @var int $home
+        * @var int $lastLogin
         */
        private $lastLogin;
 

diff --git a/settings/users.php b/settings/users.php
index f9655793e2f1b97eee3c4c6611b7ca8af1eac0fa..8f72fc9d5c81242226f6d541129e919a544a8484 100644 (file)
--- a/settings/users.php
+++ b/settings/users.php
@@ -22,17 +22,6 @@ $users = array();
 $userManager = \OC_User::getManager();
 $groupManager = \OC_Group::getManager();
 
-if (isset($_GET['offset'])) {
-       $offset = $_GET['offset'];
-} else {
-       $offset = 0;
-}
-if (isset($_GET['limit'])) {
-       $limit = $_GET['limit'];
-} else {
-       $limit = 10;
-}
-
 $isAdmin = OC_User::isAdminUser(OC_User::getUser());
 
 $groupsInfo = new \OC\Group\MetaData(OC_User::getUser(), $isAdmin, $groupManager);