Changeset 840 for trunk

Timestamp:

Jan 10, 2016, 12:08:23 AM (9 years ago)

Author:

chronos

Message:

• Fixed: Initial installation was not functional.

Location:

trunk

Files:

• admin/install.php (modified) (3 diffs)
• includes/Locale.php (modified) (2 diffs)
• includes/Version.php (modified) (1 diff)

trunk/admin/install.php

@@ -1 +1 @@
 <?php
 
-include_once(dirname(__FILE__).'/../includes/Database.php');
-include_once(dirname(__FILE__).'/../includes/AppModule.php');
-include_once(dirname(__FILE__).'/../includes/Base.php');
+include_once(dirname(__FILE__).'/../Packages/Common/Common.php');
 include_once(dirname(__FILE__).'/../includes/global.php');
 include_once(dirname(__FILE__).'/../includes/system.php');
@@ -13 +11 @@
 include_once(dirname(__FILE__).'/../includes/Version.php');
 include_once(dirname(__FILE__).'/../includes/Locale.php');
-$Locale = new LocaleManager();
-$Locale->Dir = dirname(__FILE__).'/../locale';
-$Locale->LoadLocale('en');
 
 function ControlPanel()
@@ -176 +171 @@
   $System = new Core();
   $System->Init();
+  $Locale = new LocaleManager($System);
+  $Locale->Dir = dirname(__FILE__).'/../locale';
+  $Locale->LoadLocale('en');
   $UpdateManager = new UpdateManager();
   $UpdateManager->Database = $System->Database;

trunk/includes/Locale.php

@@ -31 +31 @@
   var $Dir;
 
-  function __construct($System)
+  function __construct(System $System)
   {
     parent::__construct($System);
@@ -163 +163 @@
   var $Dir;
 
-  function __construct($System)
+  function __construct(System $System)
   {
     parent::__construct($System);

trunk/includes/Version.php

@@ -6 +6 @@
 // and system will need database update.
 
-$Revision = 839; // Subversion revision
+$Revision = 840; // Subversion revision
 $DatabaseRevision = 811; // Database structure revision
 $ReleaseTime = '2016-01-11';