Merge e279785301 into b985f052cf

code/Controllers/ModelAsController.php

@@ -60,7 +60,7 @@ class ModelAsController extends Controller implements NestedController
                 Director::absoluteBaseURL(),
                 'dev/build',
                 '?' . http_build_query([
-                    'BackURL' => isset($_GET['url']) ? $_GET['url'] : null,
+                    'returnURL' => isset($_GET['url']) ? $_GET['url'] : null,
                 ])
             ));
         }
@@ -81,7 +81,7 @@ class ModelAsController extends Controller implements NestedController
 
         // 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?BackURL=' . (isset($_GET['url']) ? urlencode($_GET['url']) : null)));
+            $this->getResponse()->redirect(Controller::join_links(Director::absoluteBaseURL(), 'dev/build?returnURL=' . (isset($_GET['url']) ? urlencode($_GET['url']) : null)));
             $this->popCurrent();
 
             return $this->getResponse();

code/Controllers/RootURLController.php

@@ -78,7 +78,7 @@ class RootURLController extends Controller implements Resettable
                 Director::absoluteBaseURL(),
                 'dev/build',
                 '?' . http_build_query([
-                    'BackURL' => isset($_GET['url']) ? $_GET['url'] : null,
+                    'returnURL' => isset($_GET['url']) ? $_GET['url'] : null,
                 ])
             ));
         }
@@ -91,7 +91,7 @@ class RootURLController extends Controller implements Resettable
 
         if (!$this->getResponse()->isFinished()) {
             if (!DB::is_active() || !ClassInfo::hasTable('SiteTree')) {
-                $this->getResponse()->redirect(Director::absoluteBaseURL() . 'dev/build?BackURL=' . (isset($_GET['url']) ? urlencode($_GET['url']) : null));
+                $this->getResponse()->redirect(Director::absoluteBaseURL() . 'dev/build?returnURL=' . (isset($_GET['url']) ? urlencode($_GET['url']) : null));
                 return $this->getResponse();
             }