Merge pull request #900 from cakephp/issue-899

markstory · web-flow · commit 3a5e95630901 · 2022-04-23T23:22:38.000-04:00
Don't overwrite App.fullBaseUrl
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
@@ -29,7 +29,7 @@
 
 require dirname(__DIR__) . '/config/bootstrap.php';
 
-if (empty($_SERVER['HTTP_HOST'])) {
+if (empty($_SERVER['HTTP_HOST']) && !Configure::read('App.fullBaseUrl')) {
     Configure::write('App.fullBaseUrl', 'http://localhost');
 }
 

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@`
`29`	`29`
`30`	`30`	`require dirname(__DIR__) . '/config/bootstrap.php';`
`31`	`31`
`32`		`-if (empty($_SERVER['HTTP_HOST'])) {`
	`32`	`+if (empty($_SERVER['HTTP_HOST']) && !Configure::read('App.fullBaseUrl')) {`
`33`	`33`	`Configure::write('App.fullBaseUrl', 'http://localhost');`
`34`	`34`	`}`
`35`	`35`