Skip to content
Permalink
Browse files

Fix 2.6 merge errors.

  • Loading branch information...
ADmad committed Jul 27, 2014
1 parent bf13b61 commit 6866d3aecdcd381e0fe8e8ecd351e272a01b24a6
Showing with 1 addition and 1 deletion.
  1. +1 −1 tests/TestCase/Network/RequestTest.php
@@ -2087,7 +2087,7 @@ public function testHere() {
public function testHereWithSpaceInUrl() {
Configure::write('App.base', '');
$_GET = array('/admin/settings/settings/prefix/Access_Control' => '');
$request = new CakeRequest('/admin/settings/settings/prefix/Access%20Control');
$request = new Request('/admin/settings/settings/prefix/Access%20Control');
$result = $request->here();
$this->assertEquals('/admin/settings/settings/prefix/Access%20Control', $result);

0 comments on commit 6866d3a

Please sign in to comment.
You can’t perform that action at this time.