merge recent changes with HEAD - R1 and HEAD are identical now

1 files changed, 7 insertions, 7 deletions

diff --git a/book_to_html.php b/book_to_html.php
index 05b1738..d55a287 100644
--- a/book_to_html.php
+++ b/book_to_html.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * $Header: /cvsroot/bitweaver/_bit_wiki/book_to_html.php,v 1.2 2005/06/28 07:46:27 spiderr Exp $
+ * $Header: /cvsroot/bitweaver/_bit_wiki/book_to_html.php,v 1.3 2005/08/01 18:42:04 squareing Exp $
  *
  * Copyright (c) 2004 bitweaver.org
  * Copyright (c) 2003 tikwiki.org
@@ -8,7 +8,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
  *
- * $Id: book_to_html.php,v 1.2 2005/06/28 07:46:27 spiderr Exp $
+ * $Id: book_to_html.php,v 1.3 2005/08/01 18:42:04 squareing Exp $
  * @package wiki
  * @subpackage functions
  */
@@ -60,19 +60,19 @@ function deldirfiles($dir){
 }
 
 if( !$gBitUser->isAdmin() ) {
-	$smarty->assign('msg', tra("You dont have permission to use this feature"));
+	$gBitSmarty->assign('msg', tra("You dont have permission to use this feature"));
 	$gBitSystem->display( 'error.tpl' );
 	die;
 }
 
 $struct_info = $structlib->s_get_structure_info($_REQUEST['struct']);
-$smarty->assign_by_ref('struct_info',$struct_info);
+$gBitSmarty->assign_by_ref('struct_info',$struct_info);
 
-$smarty->assign('generated','y');
+$gBitSmarty->assign('generated','y');
 if(isset($_REQUEST['create'])) {
   $name=$_REQUEST['name'];
   $dir=$_REQUEST['dir'];
-  $smarty->assign('dir',$_REQUEST['dir']);
+  $gBitSmarty->assign('dir',$_REQUEST['dir']);
   $struct=$_REQUEST['struct'];
   $top=$_REQUEST['top'];
   $top='foo1';
@@ -102,7 +102,7 @@ if(isset($_REQUEST['create'])) {
   copys("lib/bithelp","$base/");
 
   $structlib->structure_to_webhelp($struct,$dir,$top);
-  $smarty->assign('generated','y');
+  $gBitSmarty->assign('generated','y');
 }
 
 // Display the template