diff options
| author | Max Kremmel <xing@synapse.plus.com> | 2005-07-25 20:02:07 +0000 |
|---|---|---|
| committer | Max Kremmel <xing@synapse.plus.com> | 2005-07-25 20:02:07 +0000 |
| commit | b5a06219c50aa709c8a4f4f0b8b034f2c9c56878 (patch) | |
| tree | f3d02656948d66b1485c0c0d134dfe4fb801286b /install_packages.php | |
| parent | 303cb7200c2ef868b25113af4d524122807dc2d5 (diff) | |
| download | install-b5a06219c50aa709c8a4f4f0b8b034f2c9c56878.tar.gz install-b5a06219c50aa709c8a4f4f0b8b034f2c9c56878.tar.bz2 install-b5a06219c50aa709c8a4f4f0b8b034f2c9c56878.zip | |
Merge recent changes R1 1.0.2 beta --> HEAD
Diffstat (limited to 'install_packages.php')
| -rw-r--r-- | install_packages.php | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/install_packages.php b/install_packages.php index 1a1200e..ce03c21 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.5 2005/07/17 17:36:04 squareing Exp $ + * @version $Header: /cvsroot/bitweaver/_bit_install/install_packages.php,v 1.6 2005/07/25 20:02:06 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( !$gBitInstaller && (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 ); } @@ -205,14 +205,6 @@ if( isset( $_REQUEST['fSubmitDbCreate'] ) ) { unset( $_SESSION['email'] ); } - /** - * setup categories - */ - if( in_array( 'categories', $_REQUEST['PACKAGE'] ) ) { - // Installing categories has some special things to take care of here and needs a separate check. - require_once( CATEGORIES_PKG_PATH.'categ_lib.php' ); - $categlib->add_category( NULL, 'TOP', NULL, 0 ); - } } $smarty->assign( 'next_step', $step + 1 ); $smarty->assign( 'package_list', $package_list ); |