adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 03:18:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/2.0' into 2.0-class-loading

Browse source
This commit is contained in:
Jose Lorenzo Rodriguez 2011-03-09 12:58:49 -04:30
commit 75e5496983
4 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lib/Cake/Controller/Controller.php
View file

@ -399,7 +399,14 @@ class Controller extends Object {
/** /**
* Sets the request objects and configures a number of controller properties * Sets the request objects and configures a number of controller properties
* based on the contents of the request. * based on the contents of the request. The properties that get set are
*
* - $this->request - To the $request parameter
* - $this->plugin - To the $request->params['plugin']
* - $this->view - To the $request->params['action']
* - $this->autoLayout - To the false if $request->params['bare']; is set.
* - $this->autoRender - To false if $request->params['return'] == 1
* - $this->passedArgs - The the combined results of params['named'] and params['pass]
* *
* @param CakeRequest $request * @param CakeRequest $request
* @return void * @return void
@ -407,7 +414,7 @@ class Controller extends Object {
public function setRequest(CakeRequest $request) { public function setRequest(CakeRequest $request) {
$this->request = $request; $this->request = $request;
$this->plugin = isset($request->params['plugin']) ? $request->params['plugin'] : null; $this->plugin = isset($request->params['plugin']) ? $request->params['plugin'] : null;
$this->view = isset($request->params['action']) ? $request->params['action'] : null;
if (isset($request->params['pass']) && isset($request->params['named'])) { if (isset($request->params['pass']) && isset($request->params['named'])) {
$this->passedArgs = array_merge($request->params['pass'], $request->params['named']); $this->passedArgs = array_merge($request->params['pass'], $request->params['named']);
} }

3
lib/Cake/Routing/Route/RedirectRoute.php
View file

@ -69,8 +69,7 @@ class RedirectRoute extends CakeRoute {
$redirect = $this->redirect[0]; $redirect = $this->redirect[0];
} }
if (isset($this->options['persist']) && is_array($redirect)) { if (isset($this->options['persist']) && is_array($redirect)) {
$argOptions['context'] = array('action' => $redirect['action'], 'controller' => $redirect['controller']); $redirect += array('named' => $params['named'], 'pass' => $params['pass'], 'url' => array());
$redirect += Router::getArgs($params['_args_'], $argOptions) + array('url' => array());
$redirect = Router::reverse($redirect); $redirect = Router::reverse($redirect);
} }
$status = 301; $status = 301;

1
lib/Cake/TestSuite/ControllerTestCase.php
View file

@ -174,6 +174,7 @@ class ControllerTestCase extends CakeTestCase {
* Tests a controller action. * Tests a controller action.
* *
* ### Options: * ### Options:
*
* - `data` POST or GET data to pass * - `data` POST or GET data to pass
* - `method` POST or GET * - `method` POST or GET
* *

2
lib/Cake/tests/cases/libs/controller/scaffold.test.php
View file

@ -487,7 +487,7 @@ class ScaffoldViewTest extends CakeTestCase {
function testEditScaffold() { function testEditScaffold() {
$this->Controller->request->base = ''; $this->Controller->request->base = '';
$this->Controller->request->webroot = '/'; $this->Controller->request->webroot = '/';
$this->Controller->request->here = '/scaffold_mock'; $this->Controller->request->here = '/scaffold_mock/edit/1';
$params = array( $params = array(
'plugin' => null, 'plugin' => null,