Overwriting App.fullBaseURL if changed using Router::baseURL()

cakephp · Jun 5, 2013 · 7b746cc · 7b746cc
1 parent 4bc92b8
commit 7b746cc
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/lib/Cake/Routing/Router.php b/lib/Cake/Routing/Router.php
@@ -920,6 +920,7 @@ public static function url($url = null, $full = false) {
 	public static function baseURL($base = null) {
 		if ($base !== null) {
 			self::$_baseURL = $base;
+			Configure::write('App.fullBaseURL', $base);
 		}
 		if (empty(self::$_baseURL)) {
 			self::$_baseURL = Configure::read('App.fullBaseURL');

diff --git a/lib/Cake/Test/Case/Routing/RouterTest.php b/lib/Cake/Test/Case/Routing/RouterTest.php
@@ -50,6 +50,7 @@ public function tearDown() {
 		parent::tearDown();
 		CakePlugin::unload();
 		Router::baseURL('');
+		Configure::write('App.fullBaseURL', 'http://localhost');
 	}
 
 /**
@@ -73,8 +74,10 @@ public function testBaseURL() {
 		$this->assertEquals(FULL_BASE_URL, Router::baseUrl());
 		Router::baseURL('http://example.com');
 		$this->assertEquals('http://example.com/', Router::url('/', true));
+		$this->assertEquals('http://example.com', Configure::read('App.fullBaseURL'));
 		Router::baseURL('https://example.com');
 		$this->assertEquals('https://example.com/', Router::url('/', true));
+		$this->assertEquals('https://example.com', Configure::read('App.fullBaseURL'));
 	}
 
 /**