GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

[CORE][UX] Save previous url to redirect back after registering

This commit is contained in:
Hugo Sales 2020-07-25 23:58:26 +00:00 committed by Hugo Sales
parent ead29a636d
commit 17f854b1d9
Signed by: someonewithpc
GPG Key ID: 7D0C7EAFC9D835A0
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Core/GNUsocial.php
View File

@ -101,7 +101,7 @@ class GNUsocial implements EventSubscriberInterface
$this->session = $sess;
$this->security = $sec;
$this->register();
$this->initialize();
}
/**
@ -109,7 +109,7 @@ class GNUsocial implements EventSubscriberInterface
*
* @param EventDispatcherInterface $event_dispatcher
*/
public function register(): void
public function initialize(): void
{
Log::setLogger($this->logger);
Event::setDispatcher($this->event_dispatcher);
@ -151,11 +151,11 @@ class GNUsocial implements EventSubscriberInterface
$request = $event->getRequest();
// Save the target path, so we can redirect back after logging in
if (!(!$event->isMasterRequest() || $request->isXmlHttpRequest() || 'login' === $request->attributes->get('_route'))) {
$this->saveTargetPath($this->session, 'main', $request->getUri());
if (!(!$event->isMasterRequest() || $request->isXmlHttpRequest() || in_array($request->attributes->get('_route'), ['login', 'initialize']))) {
$this->saveTargetPath($this->session, 'main', $request->getBaseUrl());
}
$this->register();
$this->initialize();
return $event;
}
@ -171,7 +171,7 @@ class GNUsocial implements EventSubscriberInterface
public function onCommand(ConsoleCommandEvent $event,
string $event_name): ConsoleCommandEvent
{
$this->register();
$this->initialize();
return $event;
}