- during installation, object Piwik_Option wasn't created properly.

2 files changed, 17 insertions, 5 deletions

diff --git a/core/FrontController.php b/core/FrontController.php
index 71a940c9c6..1fdaf14751 100644
--- a/core/FrontController.php
+++ b/core/FrontController.php
@@ -231,8 +231,6 @@ class Piwik_FrontController
 			Piwik::createDatabaseObject();
 			Piwik::createLogObject();
 			
-			Zend_Registry::set('option', new Piwik_Option());
-			
 			Piwik_Translate::getInstance()->loadUserTranslation();
 			$pluginsManager->setLanguageToLoad( Piwik_Translate::getInstance()->getLanguageToLoad() );
 			$pluginsManager->postLoadPlugins();
diff --git a/core/Option.php b/core/Option.php
index fd1381a798..95483998c1 100644
--- a/core/Option.php
+++ b/core/Option.php
@@ -3,7 +3,21 @@ class Piwik_Option
 {
 	private $all = array();
 
-	public function __construct()
+	static private $instance = null;
+	/**
+	 * @return Piwik_Option
+	 */
+	static public function getInstance()
+	{
+		if (self::$instance == null)
+		{			
+			$c = __CLASS__;
+			self::$instance = new $c();
+		}
+		return self::$instance;
+	}
+	
+	private function __construct() 
 	{
 	}
 
@@ -59,10 +73,10 @@ class Piwik_Option
 
 function Piwik_GetOption($name)
 {
-	return Zend_Registry::get('option')->get($name);
+	return Piwik_Option::getInstance()->get($name);
 }
 
 function Piwik_UpdateOption($name, $value, $autoload = 0)
 {
-	Zend_Registry::get('option')->set($name, $value, $autoload);
+	Piwik_Option::getInstance()->set($name, $value, $autoload);
 }