tonyair/silverstripe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-cms synced 2024-10-22 08:05:56 +02:00
Code Issues Projects Releases Wiki Activity

ENH Use standardised BackURL instead of non-standard returnURL (#2999)

Browse Source
This commit is contained in:
Guy Sartorelli 2024-09-27 10:00:33 +12:00 committed by GitHub
parent b985f052cf
commit 6194844f61
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
code/Controllers/ModelAsController.php
View File

@ -60,7 +60,7 @@ class ModelAsController extends Controller implements NestedController
Director::absoluteBaseURL(), Director::absoluteBaseURL(),
'dev/build', 'dev/build',
'?' . http_build_query([ '?' . http_build_query([
'returnURL' => isset($_GET['url']) ? $_GET['url'] : null, 'BackURL' => 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 the database has not yet been created, redirect to the build page.
if (!DB::is_active() || !ClassInfo::hasTable('SiteTree')) { 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(); $this->popCurrent();
return $this->getResponse(); return $this->getResponse();

4
code/Controllers/RootURLController.php
View File

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