- $returnUrl = $url;
-
- if (null === $url) {
- if ('' !== $fallback) {
- $returnUrl = $fallback;
- } else {
- $returnUrl = $this->router->generate('homepage');
- }
+ $user = $this->tokenStorage->getToken() ? $this->tokenStorage->getToken()->getUser() : null;
+
+ if (null === $user || !is_object($user)) {
+ return $url;
+ }
+
+ if (!$ignoreActionMarkAsRead &&
+ Config::REDIRECT_TO_HOMEPAGE === $user->getConfig()->getActionMarkAsRead()) {
+ return $this->router->generate('homepage');
+ }
+
+ if (null !== $url) {
+ return $url;
+ }
+
+ if ('' === $fallback) {
+ return $this->router->generate('homepage');