diff options
| author | Max Kremmel <xing@synapse.plus.com> | 2005-07-17 17:36:05 +0000 |
|---|---|---|
| committer | Max Kremmel <xing@synapse.plus.com> | 2005-07-17 17:36:05 +0000 |
| commit | 303cb7200c2ef868b25113af4d524122807dc2d5 (patch) | |
| tree | 8fa6131147fd80c04fd1cc1a964d64b1da15a0ea /install.php | |
| parent | 54937494744116492a4392f0cfb7fb9b625b124c (diff) | |
| download | install-303cb7200c2ef868b25113af4d524122807dc2d5.tar.gz install-303cb7200c2ef868b25113af4d524122807dc2d5.tar.bz2 install-303cb7200c2ef868b25113af4d524122807dc2d5.zip | |
Merge recent changes from R1 to HEAD - never doing this again.
Diffstat (limited to 'install.php')
| -rw-r--r-- | install.php | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/install.php b/install.php index 4631957..8fbb3fe 100644 --- a/install.php +++ b/install.php @@ -1,6 +1,6 @@ <?php /** - * @version $Header: /cvsroot/bitweaver/_bit_install/install.php,v 1.2 2005/06/28 07:45:45 spiderr Exp $ + * @version $Header: /cvsroot/bitweaver/_bit_install/install.php,v 1.3 2005/07/17 17:36:04 squareing Exp $ * @package install * @subpackage functions */ @@ -69,9 +69,6 @@ if( $onlyDuringFirstInstall ) { $install_file[$i]['file'] = 'data'; $install_file[$i++]['name'] = 'Database Population'; } -} else { - $install_file[$i]['file'] = 'beta1_beta2'; - $install_file[$i++]['name'] = 'Beta 1 --> Beta 2'; } $install_file[$i]['file'] = 'final'; $install_file[$i]['name'] = 'Installation Complete'; @@ -103,10 +100,10 @@ for( $done = 0; $done < $step; $done++ ) { if( $app == "_done" ) { $install_file[$step]['state'] = 'success'; $done++; -} elseif( $failedcommands || isset( $warning ) ) { - $install_file[$step]['state'] = 'warning'; } elseif( isset( $error ) ) { $install_file[$step]['state'] = 'error'; +} elseif( $failedcommands || isset( $warning ) ) { + $install_file[$step]['state'] = 'warning'; } else { $install_file[$step]['state'] = 'current'; } |