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_packages.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'upgrade_packages.php')

diff --git a/upgrade_packages.php b/upgrade_packages.php
index cb2bb07..17e887b 100644
--- a/upgrade_packages.php
+++ b/upgrade_packages.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version $Header: /cvsroot/bitweaver/_bit_install/upgrade_packages.php,v 1.2 2005/06/28 07:45:45 spiderr Exp $
+ * @version $Header: /cvsroot/bitweaver/_bit_install/upgrade_packages.php,v 1.3 2005/08/01 18:40:30 squareing Exp $
  * @package install
  * @subpackage upgrade
  */
@@ -9,7 +9,7 @@
 // All Rights Reserved. See copyright.txt for details and a complete list of authors.
 // Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details.
 
-$smarty->assign( 'next_step',$step );
+$gBitSmarty->assign( 'next_step',$step );
 $config_file = empty($_SERVER['CONFIG_INC']) ? '../kernel/config_inc.php' : $_SERVER['CONFIG_INC'];
 
 // set the maximum execution time to very high
@@ -26,8 +26,8 @@ $upgradePath = array (
 	'BONNIE' => array( 'BONNIE' => 'CLYDE' ),
 );
 
-$smarty->assign( 'upgradeFrom', $gUpgradeFrom );
-$smarty->assign( 'upgradeTo', $gUpgradeTo );
+$gBitSmarty->assign( 'upgradeFrom', $gUpgradeFrom );
+$gBitSmarty->assign( 'upgradeTo', $gUpgradeTo );
 
 $upPackages = array();
 
@@ -62,9 +62,9 @@ if( !empty( $_REQUEST['upgrade'] ) ) {
 		}
 	}
 
-	$smarty->assign( 'package_list', $upPackages );
+	$gBitSmarty->assign( 'package_list', $upPackages );
 
 	$app = '_done';
-	$smarty->assign( 'next_step',$step + 1 );
+	$gBitSmarty->assign( 'next_step',$step + 1 );
 }
 ?>
-- 
cgit v1.3