From 796abac6241f626d947a98c281ce036ae9b5cf61 Mon Sep 17 00:00:00 2001
From: Max Kremmel <xing@synapse.plus.com>
Date: Mon, 1 Aug 2005 18:40:31 +0000
Subject: merge recent changes with HEAD - R1 and HEAD are identical now

---
 upgrade.php | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'upgrade.php')

diff --git a/upgrade.php b/upgrade.php
index 2f17222..4c70913 100644
--- a/upgrade.php
+++ b/upgrade.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version $Header: /cvsroot/bitweaver/_bit_install/upgrade.php,v 1.2 2005/06/28 07:45:45 spiderr Exp $
+ * @version $Header: /cvsroot/bitweaver/_bit_install/upgrade.php,v 1.3 2005/08/01 18:40:30 squareing Exp $
  * @package install
  * @subpackage upgrade
  */
@@ -74,17 +74,17 @@ foreach( $install_file as $key => $menu_step ) {
 		}
 	}
 }
-$smarty->assign( 'step', $step );
-$smarty->assign( 'menu_steps', $install_file );
-$smarty->assign( 'menu_file', 'upgrade.php' );
-$smarty->assign( 'section', 'Upgrade' );
+$gBitSmarty->assign( 'step', $step );
+$gBitSmarty->assign( 'menu_steps', $install_file );
+$gBitSmarty->assign( 'menu_file', 'upgrade.php' );
+$gBitSmarty->assign( 'section', 'Upgrade' );
 
 $steps = ( count( $install_file ) );
 $progress = ( ceil( 100 / $steps * $done ) );
-$smarty->assign( 'progress', $progress );
+$gBitSmarty->assign( 'progress', $progress );
 
 
-$smarty->assign( 'install_file', INSTALL_PKG_PATH."templates/upgrade_".$install_file[$step]['file'].$app.".tpl" );
+$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'] );
 
 // -------------------------------------------------------------------------------------------------------- //
@@ -141,17 +141,17 @@ if ( isset( $_REQUEST['fSubmitWelcome'] ) ) {
 	$install_file = 'upgrade_results';
 } else {
 	$install_file= 'upgrade_welcome';
-	$smarty->assign( 'upgradeFrom', $gUpgradeFrom );
-	$smarty->assign( 'upgradeTo', $gUpgradeTo );
+	$gBitSmarty->assign( 'upgradeFrom', $gUpgradeFrom );
+	$gBitSmarty->assign( 'upgradeTo', $gUpgradeTo );
 }
 
-$smarty->assign( 'install_file', INSTALL_PKG_PATH."templates/".$install_file.".tpl" );
+$gBitSmarty->assign( 'install_file', INSTALL_PKG_PATH."templates/".$install_file.".tpl" );
 if( file_exists( $install_file.'.php' ) ) {
 	// finally we are ready to include the actual php file
 	include_once( $install_file.'.php' );
 }
 
-$smarty->display( INSTALL_PKG_PATH.'templates/install.tpl' );
+$gBitSmarty->display( INSTALL_PKG_PATH.'templates/install.tpl' );
 */
 
 ?>
-- 
cgit v1.3