diff options
| author | Stephan Borg <wolff_borg@users.sourceforge.net> | 2006-09-02 15:33:15 +0000 |
|---|---|---|
| committer | Stephan Borg <wolff_borg@users.sourceforge.net> | 2006-09-02 15:33:15 +0000 |
| commit | 1f8131dc5200e085086da15f110b19230efe7805 (patch) | |
| tree | 77e456afe89e84c139fe66cf31303a1344bf1128 | |
| parent | f628a7d2d8790aeb425cbcc5562e9514138c5433 (diff) | |
| download | install-1f8131dc5200e085086da15f110b19230efe7805.tar.gz install-1f8131dc5200e085086da15f110b19230efe7805.tar.bz2 install-1f8131dc5200e085086da15f110b19230efe7805.zip | |
Applied SF Patch#1258495
| -rw-r--r-- | install_bit_settings.php | 4 | ||||
| -rw-r--r-- | install_datapump.php | 4 | ||||
| -rw-r--r-- | install_packages.php | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/install_bit_settings.php b/install_bit_settings.php index c4243c3..1fe5b4f 100644 --- a/install_bit_settings.php +++ b/install_bit_settings.php @@ -1,6 +1,6 @@ <?php /** - * @version $Header: /cvsroot/bitweaver/_bit_install/install_bit_settings.php,v 1.12 2006/03/01 20:16:12 spiderr Exp $ + * @version $Header: /cvsroot/bitweaver/_bit_install/install_bit_settings.php,v 1.13 2006/09/02 15:33:15 wolff_borg Exp $ * @package install * @subpackage functions */ @@ -63,7 +63,7 @@ if( isset( $_REQUEST['fSubmitBitSettings'] ) ) { $gBitSmarty->assign( 'next_step',$step + 1 ); } elseif( isset( $_REQUEST['skip'] ) ) { $goto = $step + 1; - header( "Location: install.php?step=$goto" ); + header( "Location: ".INSTALL_PKG_URL."install.php?step=$goto" ); } // get list of foreign packages that are ready to be installed diff --git a/install_datapump.php b/install_datapump.php index a2849d6..bd6457d 100644 --- a/install_datapump.php +++ b/install_datapump.php @@ -1,6 +1,6 @@ <?php /** - * @version $Header: /cvsroot/bitweaver/_bit_install/install_datapump.php,v 1.1 2006/08/30 11:14:16 squareing Exp $ + * @version $Header: /cvsroot/bitweaver/_bit_install/install_datapump.php,v 1.2 2006/09/02 15:33:15 wolff_borg Exp $ * @package install * @subpackage functions */ @@ -37,6 +37,6 @@ if( isset( $_REQUEST['fSubmitDataPump'] ) ) { $app = '_done'; $goto = $step + 1; $gBitSmarty->assign( 'next_step',$goto ); - header( "Location: install.php?step=$goto" ); + header( "Location: ".INSTALL_PKG_URL."install.php?step=$goto" ); } ?> diff --git a/install_packages.php b/install_packages.php index d318a5a..c4bbead 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.41 2006/08/30 07:01:19 squareing Exp $ + * @version $Header: /cvsroot/bitweaver/_bit_install/install_packages.php,v 1.42 2006/09/02 15:33:15 wolff_borg Exp $ * @package install * @subpackage functions */ @@ -28,12 +28,12 @@ $gBitSmarty->assign_by_ref( 'schema', $schema ); // confirm that we have all the admin data in the session before proceeding if( !empty( $_REQUEST['packages'] ) && in_array( 'users', $_REQUEST['packages'] ) && ( empty( $_SESSION['login'] ) || empty( $_SESSION['password'] ) || empty( $_SESSION['email'] ) ) ) { // we have lost our session password and we are not installed - header( 'Location: install.php?step=1' ); + header( 'Location: '.INSTALL_PKG_URL.'install.php?step=1' ); die; } if( !empty( $_REQUEST['cancel'] ) ) { - header( 'Location: install.php?step='.( $step + 1 ) ); + header( 'Location: '.INSTALL_PKG_URL.'install.php?step='.( $step + 1 ) ); } elseif( !empty( $_REQUEST['packages'] ) && is_array( $_REQUEST['packages'] ) && !empty( $_REQUEST['method'] ) && !empty( $_REQUEST['submit_packages'] ) ) { // make sure that required pkgs are only present when we are installing if( ( $method = ( $_REQUEST['method'] ) ) == 'install' && !$_SESSION['first_install'] ) { |