From ae7bcdc71a9ea54b34e8a4a206e2c6d4ff8623d8 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sat, 11 Mar 2017 12:13:23 +0100
Subject: [PATCH] fix singleton pattern in ActionRouter
---
inc/ActionRouter.php | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/inc/ActionRouter.php b/inc/ActionRouter.php
index d3ab2772d..8f87ac993 100644
--- a/inc/ActionRouter.php
+++ b/inc/ActionRouter.php
@@ -19,7 +19,7 @@ class ActionRouter {
protected $action;
/** @var ActionRouter */
- protected $instance;
+ protected static $instance;
/** @var int transition counter */
protected $transitions = 0;
@@ -46,11 +46,11 @@ class ActionRouter {
* @param bool $reinit
* @return ActionRouter
*/
- public function getInstance($reinit = false) {
- if(($this->instance === null) || $reinit) {
- $this->instance = new ActionRouter();
+ public static function getInstance($reinit = false) {
+ if((self::$instance === null) || $reinit) {
+ self::$instance = new ActionRouter();
}
- return $this->instance;
+ return self::$instance;
}
/**
--
GitLab