Renamed getInstance() to getSelfInstance(), conflicts BaseRegistry versus several...

[shipsimu.git] / application / ship-simu / init.php

diff --git a/application/ship-simu/init.php b/application/ship-simu/init.php
index 3b9c30a077a6085679936cbc94774eafedba5972..906cdf94ad3853bef6cf922ef2d711c124edb994 100644 (file)
--- a/application/ship-simu/init.php
+++ b/application/ship-simu/init.php
@@ -34,17 +34,11 @@
  */
 
 // Get config instance
  */
 
 // Get config instance

-$cfg = FrameworkConfiguration::getInstance();
+$cfg = FrameworkConfiguration::getSelfInstance();

 
 // Initialize output system
 require($cfg->getConfigEntry('base_path') . 'inc/output.php');
 
 
 // Initialize output system
 require($cfg->getConfigEntry('base_path') . 'inc/output.php');
 

-// Initialize file i/o system
-require($cfg->getConfigEntry('base_path') . 'inc/file_io.php');
-
-// Include the language sub-system
-require($cfg->getConfigEntry('base_path') . 'inc/language.php');
-

 // This application needs a database connection then we have to simply include
 // the inc/database.php script
 require($cfg->getConfigEntry('base_path') . 'inc/database.php');
 // This application needs a database connection then we have to simply include
 // the inc/database.php script
 require($cfg->getConfigEntry('base_path') . 'inc/database.php');