Changeset 595
- Timestamp:
- Nov 3, 2013, 11:39:59 PM (11 years ago)
- Location:
- trunk
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Application/System.php
r593 r595 1 1 <?php 2 3 $ConfigFileName = dirname(__FILE__).'/../Config/Config.php'; 4 if(file_exists($ConfigFileName)) include_once($ConfigFileName); 2 5 3 6 include_once(dirname(__FILE__).'/../Common/Application.php'); -
trunk/Application/Version.php
r594 r595 1 1 <?php 2 2 3 $Revision = 59 4; // Subversion revision3 $Revision = 595; // Subversion revision 4 4 $DatabaseRevision = 591; // SQL structure revision 5 $ReleaseTime = '2013-11-0 2';5 $ReleaseTime = '2013-11-03'; -
trunk/Common/Global.php
r593 r595 6 6 $Database = NULL; 7 7 8 $ConfigFileName = dirname(__FILE__).'/../config.php';9 if(file_exists($ConfigFileName)) include_once($ConfigFileName);10 8 include_once(dirname(__FILE__).'/VarDumper.php'); 11 9 include_once(dirname(__FILE__).'/Base.php'); -
trunk/Common/Setup/Setup.php
r594 r595 69 69 global $ConfigDefinition, $DatabaseRevision, $Config, $Updates; 70 70 71 $this->UpdateManager = $this->System->Setup->UpdateManager; 71 72 $DefaultConfig = new DefaultConfig(); 72 73 $this->ConfigDefinition = $DefaultConfig->Get(); 73 74 $this->DatabaseRevision = $DatabaseRevision; 74 $this->Config = &$Config; 75 $Updates = new Updates(); 76 $this->Updates = $Updates->Get(); 75 $this->Config = &$Config; 77 76 78 77 $Output = ''; … … 85 84 $Output .= $this->LoginPanel(); 86 85 } else 87 { 88 $this->UpdateManager = new UpdateManager(); 89 $this->UpdateManager->Database = $this->Database; 90 $this->UpdateManager->Revision = $this->DatabaseRevision; 91 $this->UpdateManager->Trace = $this->Updates; 92 $this->UpdateManager->InstallMethod = 'FullInstall'; 93 86 { 94 87 if(array_key_exists('action', $_GET)) $Action = $_GET['action']; 95 88 else $Action = ''; … … 322 315 function CreateConfig($Config) 323 316 { 324 325 317 $Output = "<?php\n\n". 326 318 "\$IsDeveloper = in_array(\$_SERVER['REMOTE_ADDR'], array('127.0.0.1'));\n\n"; … … 378 370 // Check database persistence structure 379 371 $this->UpdateManager = new UpdateManager(); 380 $this->UpdateManager->Database = &$this->Database;372 $this->UpdateManager->Database = $this->Database; 381 373 $this->UpdateManager->Revision = $DatabaseRevision; 374 $Updates = new Updates(); 375 $this->UpdateManager->Trace = $Updates->Get(); 376 $this->UpdateManager->InstallMethod = 'FullInstall'; 382 377 } 383 378 -
trunk/Common/Setup/Updates.php
r592 r595 453 453 function Get() 454 454 { 455 return( $Updates =array(455 return(array( 456 456 491 => array('Revision' => 493, 'Function' => 'UpdateTo493'), 457 457 493 => array('Revision' => 494, 'Function' => 'UpdateTo494'), … … 478 478 584 => array('Revision' => 591, 'Function' => 'UpdateTo591'), 479 479 )); 480 481 } 480 } 481 }
Note:
See TracChangeset
for help on using the changeset viewer.