Making singleton access use a class property.

cakephp · Apr 20, 2010 · 661c768 · 661c768
1 parent 7bf594f
commit 661c768
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/cake/libs/router.php b/cake/libs/router.php
@@ -26,6 +26,13 @@
  */
 class Router {
 
+/**
+ * Instance for the singleton
+ *
+ * @var Router
+ */
+	protected static $_instance;
+
 /**
  * Array of routes connected with Router::connect()
  *
@@ -184,12 +191,10 @@ function __setPrefixes() {
  * @return Router Instance of the Router.
  */
 	public static function &getInstance() {
-		static $instance = array();
-
-		if (!$instance) {
-			$instance[0] =& new Router();
+		if (!self::$_instance) {
+			self::$_instance = new Router();
 		}
-		return $instance[0];
+		return self::$_instance;
 	}
 
 /**