Skip to content

Commit

Permalink
Update passedArgs
Browse files Browse the repository at this point in the history
named parameters have been removed.
  • Loading branch information
markstory committed Jul 4, 2012
1 parent 2c5f251 commit 31229dd
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions lib/Cake/Controller/Controller.php
Expand Up @@ -462,8 +462,8 @@ public function setRequest(Request $request) {
$this->request = $request;
$this->plugin = isset($request->params['plugin']) ? Inflector::camelize($request->params['plugin']) : null;
$this->view = isset($request->params['action']) ? $request->params['action'] : null;
if (isset($request->params['pass']) && isset($request->params['named'])) {
$this->passedArgs = array_merge($request->params['pass'], $request->params['named']);
if (isset($request->params['pass'])) {
$this->passedArgs = $request->params['pass'];
}

if (array_key_exists('return', $request->params) && $request->params['return'] == 1) {
Expand Down

0 comments on commit 31229dd

Please sign in to comment.