Changeset 840
- Timestamp:
- Jan 10, 2016, 12:08:23 AM (9 years ago)
- Location:
- trunk
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/admin/install.php
r838 r840 1 1 <?php 2 2 3 include_once(dirname(__FILE__).'/../includes/Database.php'); 4 include_once(dirname(__FILE__).'/../includes/AppModule.php'); 5 include_once(dirname(__FILE__).'/../includes/Base.php'); 3 include_once(dirname(__FILE__).'/../Packages/Common/Common.php'); 6 4 include_once(dirname(__FILE__).'/../includes/global.php'); 7 5 include_once(dirname(__FILE__).'/../includes/system.php'); … … 13 11 include_once(dirname(__FILE__).'/../includes/Version.php'); 14 12 include_once(dirname(__FILE__).'/../includes/Locale.php'); 15 $Locale = new LocaleManager();16 $Locale->Dir = dirname(__FILE__).'/../locale';17 $Locale->LoadLocale('en');18 13 19 14 function ControlPanel() … … 176 171 $System = new Core(); 177 172 $System->Init(); 173 $Locale = new LocaleManager($System); 174 $Locale->Dir = dirname(__FILE__).'/../locale'; 175 $Locale->LoadLocale('en'); 178 176 $UpdateManager = new UpdateManager(); 179 177 $UpdateManager->Database = $System->Database; -
trunk/includes/Locale.php
r816 r840 31 31 var $Dir; 32 32 33 function __construct( $System)33 function __construct(System $System) 34 34 { 35 35 parent::__construct($System); … … 163 163 var $Dir; 164 164 165 function __construct( $System)165 function __construct(System $System) 166 166 { 167 167 parent::__construct($System); -
trunk/includes/Version.php
r839 r840 6 6 // and system will need database update. 7 7 8 $Revision = 8 39; // Subversion revision8 $Revision = 840; // Subversion revision 9 9 $DatabaseRevision = 811; // Database structure revision 10 10 $ReleaseTime = '2016-01-11';
Note:
See TracChangeset
for help on using the changeset viewer.