From f27566336c10af82d198d71ae51bb567cd89da81 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sun, 14 Nov 2010 01:08:13 -0500
Subject: [PATCH] Renaming private method to protected. Removing return by
 reference operator.

---
 cake/libs/dispatcher.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/cake/libs/dispatcher.php b/cake/libs/dispatcher.php
index 0485b1c5c..95ea8055f 100644
--- a/cake/libs/dispatcher.php
+++ b/cake/libs/dispatcher.php
@@ -195,9 +195,9 @@ class Dispatcher {
  * @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;
 		}
@@ -213,9 +213,8 @@ class Dispatcher {
  *
  * @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']);