From 358da6aa4feeef1498ec63b0482af9de10ea8435 Mon Sep 17 00:00:00 2001
From: diosmosis <benaka@piwik.pro>
Date: Wed, 8 Apr 2015 23:06:07 -0700
Subject: Fix translation edit in last commit and remove local config check in
 FrontController since it's done by EnvironmentValidator.

---
 core/FrontController.php | 29 ++---------------------------
 1 file changed, 2 insertions(+), 27 deletions(-)

(limited to 'core/FrontController.php')

diff --git a/core/FrontController.php b/core/FrontController.php
index 06c08293f4..d4aed5c313 100644
--- a/core/FrontController.php
+++ b/core/FrontController.php
@@ -189,31 +189,10 @@ class FrontController extends Singleton
     /**
      * Loads the config file
      * This is overridden in tests to ensure test config file is used
-     *
-     * @return Exception
      */
     public static function createConfigObject()
     {
-        $exceptionToThrow = false;
-        try {
-            Config::getInstance()->database; // access property to check if the local file exists
-        } catch (Exception $exception) {
-            Log::debug($exception);
-
-            /**
-             * Triggered when the configuration file cannot be found or read, which usually
-             * means Piwik is not installed yet.
-             *
-             * This event can be used to start the installation process or to display a custom error message.
-             *
-             * @param Exception $exception The exception that was thrown by `Config::getInstance()`.
-             *
-             * TODO: remove?
-             */
-            Piwik::postEvent('Config.NoConfigurationFile', array($exception), $pending = true);
-            $exceptionToThrow = $exception;
-        }
-        return $exceptionToThrow;
+        Config::getInstance()->database; // access property
     }
 
     /**
@@ -235,7 +214,7 @@ class FrontController extends Singleton
         }
         $initialized = true;
 
-        $exceptionToThrow = self::createConfigObject();
+        self::createConfigObject();
 
         $tmpPath = StaticContainer::get('path.tmp');
 
@@ -257,10 +236,6 @@ class FrontController extends Singleton
         Plugin\Manager::getInstance()->loadPluginTranslations();
         Plugin\Manager::getInstance()->loadActivatedPlugins();
 
-        if ($exceptionToThrow) {
-            throw $exceptionToThrow;
-        }
-
         // try to connect to the database
         try {
             Db::createDatabaseObject();
-- 
cgit v1.2.3