diff options
| -rw-r--r-- | BitInstaller.php | 8 | ||||
| -rw-r--r-- | install.php | 4 | ||||
| -rw-r--r-- | migrate.php | 2 | ||||
| -rw-r--r-- | upgrade.php | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/BitInstaller.php b/BitInstaller.php index 38f9a94..b426751 100644 --- a/BitInstaller.php +++ b/BitInstaller.php @@ -154,7 +154,7 @@ class BitInstaller extends BitSystem { * @access public * @return void */ - function display( $pTemplate, $pBrowserTitle=NULL ) { + function display( $pPackage, $pTemplate ) { header( 'Content-Type: text/html; charset=utf-8' ); if( ini_get( 'safe_mode' ) && ini_get( 'safe_mode_gid' )) { umask( 0007 ); @@ -162,12 +162,12 @@ class BitInstaller extends BitSystem { // force the session to close *before* displaying. Why? Note this very important comment from http://us4.php.net/exec session_write_close(); - if( !empty( $pBrowserTitle ) ) { - $this->setBrowserTitle( $pBrowserTitle ); + if( !empty( $pPackage ) ) { + $this->setBrowserTitle( $pPackage ); } global $gBitSmarty; $gBitSmarty->verifyCompileDir(); - $gBitSmarty->display( $pTemplate ); + $gBitSmarty->display( NULL, $pTemplate ); } /** diff --git a/install.php b/install.php index d8cca5b..ae0fdd9 100644 --- a/install.php +++ b/install.php @@ -146,7 +146,7 @@ if( !empty( $gBitDbType ) && !empty( $gBitInstaller->mPackages['users']['install $install_file = 'login'; $gBitSmarty->assign( 'install_file', INSTALL_PKG_PATH."templates/install_".$install_file.".tpl" ); $gBitSmarty->assign( 'progress', 0 ); - $gBitSmarty->display( INSTALL_PKG_PATH.'templates/install.tpl' ); + $gBitSmarty->display( NULL, INSTALL_PKG_PATH.'templates/install.tpl' ); die; } @@ -162,5 +162,5 @@ include_once( 'install_'.$install_file[$step]['file'].'.php' ); $install_file = set_menu( $install_file, $step ); $gBitSmarty->assign( 'install_file', INSTALL_PKG_PATH."templates/install_".$install_file[$step]['file'].$app.".tpl" ); -$gBitInstaller->display( INSTALL_PKG_PATH.'templates/install.tpl', $install_file[$step]['name'] ); +$gBitInstaller->display( $install_file[$step]['name'], INSTALL_PKG_PATH.'templates/install.tpl' ); ?> diff --git a/migrate.php b/migrate.php index ef04702..31e7ff7 100644 --- a/migrate.php +++ b/migrate.php @@ -53,6 +53,6 @@ $gBitSmarty->assign( 'menu_file', 'migrate.php' ); $gBitSmarty->assign( 'section', 'Upgrade' ); $gBitSmarty->assign( 'install_file', INSTALL_PKG_PATH."templates/migrate_".$install_file[$step]['file'].$app.".tpl" ); -$gBitInstaller->display( INSTALL_PKG_PATH.'templates/install.tpl', $install_file[$step]['name'] ); +$gBitInstaller->display( $install_file[$step]['name'], INSTALL_PKG_PATH.'templates/install.tpl' ); ?> diff --git a/upgrade.php b/upgrade.php index 3f6a4ed..2ec4e70 100644 --- a/upgrade.php +++ b/upgrade.php @@ -65,6 +65,6 @@ $gBitSmarty->assign( 'menu_file', 'upgrade.php' ); $gBitSmarty->assign( 'section', 'Upgrade' ); $gBitSmarty->assign( 'install_file', INSTALL_PKG_PATH."templates/upgrade_".$install_file[$step]['file'].$app.".tpl" ); -$gBitInstaller->display( INSTALL_PKG_PATH.'templates/install.tpl', $install_file[$step]['name'] ); +$gBitInstaller->display( $install_file[$step]['name'], INSTALL_PKG_PATH.'templates/install.tpl' ); ?> |