Skip to content

Commit

Permalink
Renaming private method to protected.
Browse files Browse the repository at this point in the history
Removing return by reference operator.
  • Loading branch information
markstory committed Nov 14, 2010
1 parent f36f38e commit f275663
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions cake/libs/dispatcher.php
Expand Up @@ -195,9 +195,9 @@ public function parseParams(CakeRequest $request, $additionalParams = array()) {
* @param array $params Array of parameters
* @return mixed name of controller if not loaded, or object if loaded
*/
protected function &_getController($request) {
protected function _getController($request) {
$controller = false;
$ctrlClass = $this->__loadController($request);
$ctrlClass = $this->_loadController($request);
if (!$ctrlClass) {
return $controller;
}
Expand All @@ -213,9 +213,8 @@ protected function &_getController($request) {
*
* @param array $params Array of parameters
* @return string|bool Name of controller class name
* @access private
*/
function __loadController($request) {
protected function _loadController($request) {
$pluginName = $pluginPath = $controller = null;
if (!empty($request->params['plugin'])) {
$pluginName = $controller = Inflector::camelize($request->params['plugin']);
Expand Down

0 comments on commit f275663

Please sign in to comment.