From 2bea868994bba2b0044611da7acfaa0c2de85cc9 Mon Sep 17 00:00:00 2001
From: Guy Sartorelli <guy.sartorelli@gmail.com>
Date: Thu, 5 Sep 2024 13:30:38 +1200
Subject: [PATCH] ENH Use standardised BackURL instead of non-standard
 returnURL

---
 code/Controllers/ModelAsController.php | 4 ++--
 code/Controllers/RootURLController.php | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/code/Controllers/ModelAsController.php b/code/Controllers/ModelAsController.php
index cdc34962cc..19d79126ab 100644
--- a/code/Controllers/ModelAsController.php
+++ b/code/Controllers/ModelAsController.php
@@ -60,7 +60,7 @@ protected function beforeHandleRequest(HTTPRequest $request)
                 Director::absoluteBaseURL(),
                 'dev/build',
                 '?' . http_build_query([
-                    'returnURL' => isset($_GET['url']) ? $_GET['url'] : null,
+                    'BackURL' => isset($_GET['url']) ? $_GET['url'] : null,
                 ])
             ));
         }
@@ -81,7 +81,7 @@ public function handleRequest(HTTPRequest $request): HTTPResponse
 
         // If the database has not yet been created, redirect to the build page.
         if (!DB::is_active() || !ClassInfo::hasTable('SiteTree')) {
-            $this->getResponse()->redirect(Controller::join_links(Director::absoluteBaseURL(), 'dev/build?returnURL=' . (isset($_GET['url']) ? urlencode($_GET['url']) : null)));
+            $this->getResponse()->redirect(Controller::join_links(Director::absoluteBaseURL(), 'dev/build?BackURL=' . (isset($_GET['url']) ? urlencode($_GET['url']) : null)));
             $this->popCurrent();
 
             return $this->getResponse();
diff --git a/code/Controllers/RootURLController.php b/code/Controllers/RootURLController.php
index 2a0a3e843f..dba008192a 100644
--- a/code/Controllers/RootURLController.php
+++ b/code/Controllers/RootURLController.php
@@ -78,7 +78,7 @@ protected function beforeHandleRequest(HTTPRequest $request)
                 Director::absoluteBaseURL(),
                 'dev/build',
                 '?' . http_build_query([
-                    'returnURL' => isset($_GET['url']) ? $_GET['url'] : null,
+                    'BackURL' => isset($_GET['url']) ? $_GET['url'] : null,
                 ])
             ));
         }
@@ -91,7 +91,7 @@ public function handleRequest(HTTPRequest $request): HTTPResponse
 
         if (!$this->getResponse()->isFinished()) {
             if (!DB::is_active() || !ClassInfo::hasTable('SiteTree')) {
-                $this->getResponse()->redirect(Director::absoluteBaseURL() . 'dev/build?returnURL=' . (isset($_GET['url']) ? urlencode($_GET['url']) : null));
+                $this->getResponse()->redirect(Director::absoluteBaseURL() . 'dev/build?BackURL=' . (isset($_GET['url']) ? urlencode($_GET['url']) : null));
                 return $this->getResponse();
             }