Skip to content

Commit

Permalink
Fix 2.6 merge errors.
Browse files Browse the repository at this point in the history
  • Loading branch information
ADmad committed Jul 27, 2014
1 parent bf13b61 commit 6866d3a
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion tests/TestCase/Network/RequestTest.php
Expand Up @@ -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);
Expand Down

0 comments on commit 6866d3a

Please sign in to comment.