Merge pull request #325 from OkayCMS/feature/save_product_return_url

return to filter page after update product
OkayCMS · Mar 25, 2024 · 90f4263 · 90f4263
2 parents 522f9b2 + 94e3dad
commit 90f4263
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/backend/Controllers/ProductAdmin.php b/backend/Controllers/ProductAdmin.php
@@ -96,7 +96,12 @@ public function fetch(
 
                 //  сохранить и выход в список
                 $buttonRedirectToList = $this->request->post('apply_and_quit', 'integer', 0);
-                if (($buttonRedirectToList == 1) && !empty($urlRedirectToList = $this->request->getRootUrl() . '/backend/index.php?controller=ProductsAdmin')) {
+                if ($buttonRedirectToList == 1) {
+                    $urlRedirectToList = htmlspecialchars_decode($this->request->getRootUrl() . urldecode($this->request->get(
+                            'return',
+                            null,
+                            '/backend/index.php?controller=ProductsAdmin'
+                        )));
                     $this->postRedirectGet->redirect($urlRedirectToList);
                 }