tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

Merged revisions 52452 via svnmerge from

Browse Source 
http://svn.silverstripe.com/open/modules/sapphire/branches/2.2.2

........
  r52452 | sminnee | 2008-04-10 13:59:09 +1200 (Thu, 10 Apr 2008) | 1 line
  
  Don't strtolower ->action, as it had too many side-effects.
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@53519 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Sam Minnee 2008-04-26 06:52:49 +00:00
parent 8b508319ab
commit 45804905ed
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/control/Controller.php
View File

@ -112,7 +112,7 @@ class Controller extends ViewableData {
$this->response = new HTTPResponse(); $this->response = new HTTPResponse();
$this->requestParams = $requestParams; $this->requestParams = $requestParams;
$this->action = isset($this->urlParams['Action']) ? strtolower(str_replace("-","_",$this->urlParams['Action'])) : ""; $this->action = isset($this->urlParams['Action']) ? str_replace("-","_",$this->urlParams['Action']) : "";
if(!$this->action) $this->action = 'index'; if(!$this->action) $this->action = 'index';
// Check security on the controller // Check security on the controller
@ -561,6 +561,8 @@ class Controller extends ViewableData {
* This method is called by run() and makes use of {@link self::$allowed_actions}. * This method is called by run() and makes use of {@link self::$allowed_actions}.
*/ */
function checkAccessAction($action) { function checkAccessAction($action) {
$action = strtolower($action);
// Collate self::$allowed_actions from this class and all parent classes // Collate self::$allowed_actions from this class and all parent classes
$access = null; $access = null;
$className = $this->class; $className = $this->class;