TPS
/
ORIENT
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor fix

This commit is contained in:
Sam Georges 2014-08-08 22:02:46 +10:00
parent f21eaf05a3
commit 3fe08dfaf4
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
modules/backend/classes/BackendController.php
View File

@ -43,7 +43,7 @@ class BackendController extends ControllerBase
*/
$module = isset($params[0]) ? $params[0] : 'backend';
$controller = isset($params[1]) ? $params[1] : 'index';
self::$action = $action = isset($params[2]) ? camel_case($params[2]) : 'index';
self::$action = $action = isset($params[2]) ? $this->parseAction($params[2]) : 'index';
self::$params = $controllerParams = array_slice($params, 3);
$controllerClass = '\\'.$module.'\Controllers\\'.$controller;
if ($controllerObj = $this->findController($controllerClass, $action, '/modules'))
@ -55,7 +55,7 @@ class BackendController extends ControllerBase
if (count($params) >= 2) {
list($author, $plugin) = $params;
$controller = isset($params[2]) ? $params[2] : 'index';
self::$action = $action = isset($params[3]) ? camel_case($params[3]) : 'index';
self::$action = $action = isset($params[3]) ? $this->parseAction($params[3]) : 'index';
self::$params = $controllerParams = array_slice($params, 4);
$controllerClass = '\\'.$author.'\\'.$plugin.'\Controllers\\'.$controller;
if ($controllerObj = $this->findController($controllerClass, $action, Config::get('cms.pluginsDir', '/plugins')))
@ -97,4 +97,17 @@ class BackendController extends ControllerBase
return false;
}
/**
* Process the action name, since dashes are not supported in PHP methods.
* @param string $actionName
* @return string
*/
protected function parseAction($actionName)
{
if (strpos($actionName, '-') !== false)
return camel_case($actionName);
return $actionName;
}
}