Skip to content

Commit

Permalink
Merge pull request #5 from chris-hall-hu/master
Browse files Browse the repository at this point in the history
Use the $action parameter passed to handleAction
  • Loading branch information
camspiers committed Oct 20, 2015
2 parents 82b8994 + 488286a commit 3872025
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion code/TwigControllerTrait.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public function handleAction($request, $action)
if($v || !isset($this->urlParams[$k])) $this->urlParams[$k] = $v;
}

$this->action = str_replace("-","_",$request->param('Action'));
$this->action = str_replace("-","_",$action);
$this->requestParams = $request->requestVars();
if(!$this->action) $this->action = 'index';

Expand Down

0 comments on commit 3872025

Please sign in to comment.