diff --git a/app/Entities/User/UserRepository.php b/app/Entities/User/UserRepository.php index 2d11185..28da8ff 100644 --- a/app/Entities/User/UserRepository.php +++ b/app/Entities/User/UserRepository.php @@ -141,8 +141,8 @@ private function getLoggedInFavorites($user_id = null, $site_id = null, $group_i $favorites = $this->favoritesWithSiteID($favorites[0]); $favorites = $this->favoritesWithGroups($favorites); - if ( !is_null($site_id) && is_null($group_id) ) $favorites = Helpers::pluckSiteFavorites($site_id, $favorites); - if ( !is_null($group_id) ) $favorites = Helpers::pluckGroupFavorites($group_id, $site_id, $favorites); + if ( !is_null($site_id) && is_null($group_id) ) $favorites = Helpers::pluckSiteFavorites($favorites, $site_id); + if ( !is_null($group_id) ) $favorites = Helpers::pluckGroupFavorites($group_id, $favorites, $site_id); return $favorites; } @@ -171,8 +171,8 @@ private function getCookieFavorites($site_id = null, $group_id = null) $favorites = $this->favoritesWithSiteID($favorites); $favorites = $this->favoritesWithGroups($favorites); if ( isset($_POST['user_consent_accepted']) && $_POST['user_consent_accepted'] == 'true' ) $favorites[0]['consent_provided'] = time(); - if ( !is_null($site_id) && is_null($group_id) ) $favorites = Helpers::pluckSiteFavorites($site_id, $favorites); - if ( !is_null($group_id) ) $favorites = Helpers::pluckGroupFavorites($group_id, $site_id, $favorites); + if ( !is_null($site_id) && is_null($group_id) ) $favorites = Helpers::pluckSiteFavorites($favorites, $site_id); + if ( !is_null($group_id) ) $favorites = Helpers::pluckGroupFavorites($group_id, $favorites, $site_id); return $favorites; } @@ -241,4 +241,4 @@ public function deniedCookies() } return false; } -} \ No newline at end of file +} diff --git a/app/Helpers.php b/app/Helpers.php index 4fba1d8..996c9f6 100644 --- a/app/Helpers.php +++ b/app/Helpers.php @@ -101,20 +101,21 @@ public static function pluckSiteFavorites($site_id, $all_favorites) /** * Pluck the site favorites from saved meta array * @since 1.1 + * @param int $group_id + * @param array $all_favorites (user meta) * @param int $site_id - * @param array $favorites (user meta) * @return array */ - public static function pluckGroupFavorites($group_id, $site_id = 1, $all_favorites) + public static function pluckGroupFavorites($group_id, $all_favorites, $site_id = 1) { foreach($all_favorites as $key => $site_favorites){ if ( $site_favorites['site_id'] !== $site_id ) continue; foreach ( $all_favorites[$key]['groups'] as $group ){ - if ( $group['group_id'] == $group_id ){ + if ( isset($$group_id) && $group['group_id'] == $group_id ){ return $group['posts']; } } } return array(); } -} \ No newline at end of file +}