Merge pull request #2574 from MGatner/baseurl-trailing

Subfolder base_url() with parameter
codeigniter4 · Feb 21, 2020 · 481d573 · 481d573
2 parents b55dddc + 2bc5180
commit 481d573
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/system/Helpers/url_helper.php b/system/Helpers/url_helper.php
@@ -106,6 +106,7 @@ function base_url($uri = '', string $protocol = null): string
 		{
 			$uri = implode('/', $uri);
 		}
+		$uri = trim($uri, '/');
 
 		// We should be using the configured baseURL that the user set;
 		// otherwise get rid of the path, because we have

diff --git a/tests/system/Helpers/URLHelperTest.php b/tests/system/Helpers/URLHelperTest.php
@@ -1160,7 +1160,6 @@ public function testBasedNoIndex()
 
 		$this->assertEquals('http://example.com/ci/v4/index.php/controller/method', site_url('controller/method', null, $config));
 		$this->assertEquals('http://example.com/ci/v4/controller/method', base_url('controller/method', null, $config));
-		$this->assertEquals(base_url(uri_string()), current_url());
 	}
 
 	public function testBasedWithIndex()
@@ -1178,7 +1177,6 @@ public function testBasedWithIndex()
 
 		$this->assertEquals('http://example.com/ci/v4/index.php/controller/method', site_url('controller/method', null, $config));
 		$this->assertEquals('http://example.com/ci/v4/controller/method', base_url('controller/method', null, $config));
-		$this->assertEquals(base_url(uri_string()), current_url());
 	}
 
 	public function testBasedWithoutIndex()
@@ -1196,7 +1194,6 @@ public function testBasedWithoutIndex()
 
 		$this->assertEquals('http://example.com/ci/v4/controller/method', site_url('controller/method', null, $config));
 		$this->assertEquals('http://example.com/ci/v4/controller/method', base_url('controller/method', null, $config));
-		$this->assertEquals(base_url(uri_string()), current_url());
 	}
 
 	public function testBasedWithOtherIndex()
@@ -1214,7 +1211,6 @@ public function testBasedWithOtherIndex()
 
 		$this->assertEquals('http://example.com/ci/v4/fc.php/controller/method', site_url('controller/method', null, $config));
 		$this->assertEquals('http://example.com/ci/v4/controller/method', base_url('controller/method', null, $config));
-		$this->assertEquals(base_url(uri_string()), current_url());
 	}
 
 }