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_packages.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_packages.php')
| -rw-r--r-- | install_packages.php | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/install_packages.php b/install_packages.php index 05b27be..1a1200e 100644 --- a/install_packages.php +++ b/install_packages.php @@ -1,6 +1,6 @@ <?php /** - * @version $Header: /cvsroot/bitweaver/_bit_install/install_packages.php,v 1.4 2005/06/28 07:45:45 spiderr Exp $ + * @version $Header: /cvsroot/bitweaver/_bit_install/install_packages.php,v 1.5 2005/07/17 17:36:04 squareing Exp $ * @package install * @subpackage functions */ @@ -26,7 +26,7 @@ ksort( $schema ); $smarty->assign_by_ref( 'schema', $schema ); // confirm that we have all the admin data in the session before proceeding -if( empty( $_SESSION['login'] ) || empty( $_SESSION['password'] ) || empty( $_SESSION['email'] ) ) { +if( !$gBitInstaller && (empty( $_SESSION['login'] ) || empty( $_SESSION['password'] ) || empty( $_SESSION['email'] )) ) { $smarty->assign( 'error', $error = TRUE ); } @@ -136,11 +136,6 @@ if( isset( $_REQUEST['fSubmitDbCreate'] ) ) { $gBitInstaller->storePreference( 'package_phpbb', 'y' ); } - // and let's turn OFF tinymce cause it is annoying if you want to use the wiki - if( defined( 'TINYMCE_PKG_NAME' ) ) { - $gBitInstaller->storePreference( 'package_tinymce', 'n' ); - } - // 4. run the defaults through afterwards so we can be sure all tables needed have been created foreach( array_keys( $gBitInstaller->mPackages ) as $package ) { if( in_array( $package, $_REQUEST['PACKAGE'] ) || ( empty( $gBitInstaller->mPackages[$package]['installed'] ) && !empty( $gBitInstaller->mPackages[$package]['required'] ) ) ) { |