Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch '2.0' of github.com:cakephp/cakephp into 2.0

  • Loading branch information...
commit 926ac32549fa08e52c6672746804ab52b9bafb50 2 parents 2711178 + a929951
@lorenzo lorenzo authored
View
2  lib/Cake/Console/Command/Task/ExtractTask.php
@@ -606,7 +606,7 @@ protected function _searchFiles() {
if (!empty($this->_exclude)) {
$exclude = array();
foreach ($this->_exclude as $e) {
- if ($e[0] !== DS) {
+ if (DS !== '\\' && $e[0] !== DS) {
$e = DS . $e;
}
$exclude[] = preg_quote($e, '/');
View
1  lib/Cake/Controller/Controller.php
@@ -805,6 +805,7 @@ public function set($one, $two = null) {
*/
public function setAction($action) {
$this->request->action = $action;
+ $this->view = $action;
$args = func_get_args();
unset($args[0]);
return call_user_func_array(array(&$this, $action), $args);
View
3  lib/Cake/Test/Case/Controller/ControllerTest.php
@@ -967,7 +967,8 @@ public function testSetAction() {
$TestController = new TestController($request);
$TestController->setAction('index', 1, 2);
$expected = array('testId' => 1, 'test2Id' => 2);
- $this->assertidentical($TestController->data, $expected);
+ $this->assertSame($expected, $TestController->request->data);
+ $this->assertSame('index', $TestController->view);
}
/**
Please sign in to comment.
Something went wrong with that request. Please try again.