Handle save btn url

Author: Gengar-i

src/bundle/Controller/UserSettingsController.php

@@ -104,17 +104,23 @@ public function updateAction(Request $request, UpdateView $view)
                     'ibexa_user_settings'
                 );
 
+                $returnUrl = $request->query->has('returnUrl') ? $request->query->get('returnUrl') : null;
+
                 if ($form->getClickedButton() instanceof Button
                     && $form->getClickedButton()->getName() === UserSettingUpdateType::BTN_UPDATE_AND_EDIT
                 ) {
-                    return $this->redirectToRoute('ibexa.user_settings.update', [
+                    $routeParams = [
                         'identifier' => $data->getIdentifier(),
-                    ]);
-                }
+                    ];
+                    
+                    if ($returnUrl) {
+                        $routeParams['returnUrl'] = $returnUrl;
+                    }
 
-                if ($request->query->has('returnUrl')) {
-                    $returnUrl = $request->query->get('returnUrl');
+                    return $this->redirectToRoute('ibexa.user_settings.update', $routeParams); 
+                }
 
+                if ($returnUrl) {
                     return $this->redirect($returnUrl);
                 }