diff --git a/src/app/resource/controllers/ResController.php b/src/app/resource/controllers/ResController.php index fd6a5566afe16fa9a0ab4dea737cc41fa9344745..4a3134b76fd61f6a280e25e29796fa64129be22e 100755 --- a/src/app/resource/controllers/ResController.php +++ b/src/app/resource/controllers/ResController.php @@ -773,14 +773,14 @@ class ResController $whereClause = '(res_id in (select res_id from users_followed_resources where user_id = ?))'; - $entities = UserModel::getEntitiesByLogin(['login' => $user['user_id']]); + $entities = UserModel::getEntitiesByLogin(['login' => $user['user_id'], 'select' => ['id']]); $entities = array_column($entities, 'id'); $foldersClause = 'res_id in (select res_id from folders LEFT JOIN entities_folders ON folders.id = entities_folders.folder_id LEFT JOIN resources_folders ON folders.id = resources_folders.folder_id '; $foldersClause .= 'WHERE entities_folders.entity_id in (?) OR folders.user_id = ?)'; $whereClause .= " OR ({$foldersClause})"; - $groups = UserModel::getGroupsByLogin(['login' => $user['user_id']]); + $groups = UserModel::getGroupsByLogin(['login' => $user['user_id'], 'select' => ['where_clause']]); $groupsClause = ''; foreach ($groups as $key => $group) { if (!empty($group['where_clause'])) { diff --git a/src/app/search/controllers/SearchController.php b/src/app/search/controllers/SearchController.php index b5a0391655fa7f410020ce8711a8fd74b7396d84..55f086f188b3ef9ecc02f42a83d6326bc12233fd 100644 --- a/src/app/search/controllers/SearchController.php +++ b/src/app/search/controllers/SearchController.php @@ -35,7 +35,7 @@ class SearchController $queryParams = $request->getQueryParams(); - $entities = UserModel::getEntitiesByLogin(['login' => $GLOBALS['userId']]); + $entities = UserModel::getEntitiesByLogin(['login' => $GLOBALS['userId'], 'select' => ['id']]); $entities = array_column($entities, 'id'); $entities = empty($entities) ? [0] : $entities; @@ -45,7 +45,7 @@ class SearchController $whereClause = "(res_id in (select res_id from users_followed_resources where user_id = ?)) OR ({$foldersClause})"; $dataClause = [$GLOBALS['id'], $entities, $GLOBALS['id']]; - $groups = UserModel::getGroupsByLogin(['login' => $GLOBALS['userId']]); + $groups = UserModel::getGroupsByLogin(['login' => $GLOBALS['userId'], 'select' => ['where_clause']]); $groupsClause = ''; foreach ($groups as $key => $group) { if (!empty($group['where_clause'])) {