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

7 files changed, 23 insertions, 23 deletions

diff --git a/modules/mod_breadcrumb.php b/modules/mod_breadcrumb.php
index 7118646..18a6fbd 100644
--- a/modules/mod_breadcrumb.php
+++ b/modules/mod_breadcrumb.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * $Header: /cvsroot/bitweaver/_bit_wiki/modules/Attic/mod_breadcrumb.php,v 1.2 2005/06/28 07:46:28 spiderr Exp $
+ * $Header: /cvsroot/bitweaver/_bit_wiki/modules/Attic/mod_breadcrumb.php,v 1.3 2005/08/01 18:42:05 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: mod_breadcrumb.php,v 1.2 2005/06/28 07:46:28 spiderr Exp $
+ * $Id: mod_breadcrumb.php,v 1.3 2005/08/01 18:42:05 squareing Exp $
  * @package wiki
  * @subpackage modules
  */
@@ -20,6 +20,6 @@ if (!isset($_SESSION["breadCrumb"])) {
 	$_SESSION["breadCrumb"] = array();
 }
 $bbreadCrumb = array_reverse($_SESSION["breadCrumb"]);
-$smarty->assign('breadCrumb', $bbreadCrumb);
-$smarty->assign('maxlen', isset($module_params["maxlen"]) ? $module_params["maxlen"] : 0);
+$gBitSmarty->assign('breadCrumb', $bbreadCrumb);
+$gBitSmarty->assign('maxlen', isset($module_params["maxlen"]) ? $module_params["maxlen"] : 0);
 ?>
\ No newline at end of file
diff --git a/modules/mod_comm_received_objects.php b/modules/mod_comm_received_objects.php
index 7824782..066a160 100644
--- a/modules/mod_comm_received_objects.php
+++ b/modules/mod_comm_received_objects.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * $Header: /cvsroot/bitweaver/_bit_wiki/modules/mod_comm_received_objects.php,v 1.2 2005/06/28 07:46:28 spiderr Exp $
+ * $Header: /cvsroot/bitweaver/_bit_wiki/modules/mod_comm_received_objects.php,v 1.3 2005/08/01 18:42:06 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: mod_comm_received_objects.php,v 1.2 2005/06/28 07:46:28 spiderr Exp $
+ * $Id: mod_comm_received_objects.php,v 1.3 2005/08/01 18:42:06 squareing Exp $
  * @package wiki
  * @subpackage modules
  */
@@ -19,5 +19,5 @@
 require_once( WIKI_PKG_PATH.'BitPage.php' );
 global $wikilib;
 $ranking = $wikilib->list_received_pages(0, -1, $sort_mode = 'title_asc', '');
-$smarty->assign('modReceivedPages', $ranking["cant"]);
+$gBitSmarty->assign('modReceivedPages', $ranking["cant"]);
 ?>
diff --git a/modules/mod_last_modif_pages.php b/modules/mod_last_modif_pages.php
index 0fe445f..17c903a 100644
--- a/modules/mod_last_modif_pages.php
+++ b/modules/mod_last_modif_pages.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * $Header: /cvsroot/bitweaver/_bit_wiki/modules/mod_last_modif_pages.php,v 1.2 2005/06/28 07:46:28 spiderr Exp $
+ * $Header: /cvsroot/bitweaver/_bit_wiki/modules/mod_last_modif_pages.php,v 1.3 2005/08/01 18:42:06 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: mod_last_modif_pages.php,v 1.2 2005/06/28 07:46:28 spiderr Exp $
+ * $Id: mod_last_modif_pages.php,v 1.3 2005/08/01 18:42:06 squareing Exp $
  * @package wiki
  * @subpackage modules
  */
@@ -20,6 +20,6 @@ global $gQueryUserId, $module_rows, $module_params, $wikilib;
 require_once( WIKI_PKG_PATH.'BitPage.php' );
 $ranking = $wikilib->getList(0, $module_rows, 'last_modified_desc', NULL, $gQueryUserId );
 
-$smarty->assign('modLastModif', $ranking["data"]);
-$smarty->assign('maxlen', isset($module_params["maxlen"]) ? $module_params["maxlen"] : 0);
+$gBitSmarty->assign('modLastModif', $ranking["data"]);
+$gBitSmarty->assign('maxlen', isset($module_params["maxlen"]) ? $module_params["maxlen"] : 0);
 ?>
diff --git a/modules/mod_random_pages.php b/modules/mod_random_pages.php
index 174f5e6..98ca63b 100644
--- a/modules/mod_random_pages.php
+++ b/modules/mod_random_pages.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * $Header: /cvsroot/bitweaver/_bit_wiki/modules/mod_random_pages.php,v 1.3 2005/07/17 17:36:46 squareing Exp $
+ * $Header: /cvsroot/bitweaver/_bit_wiki/modules/mod_random_pages.php,v 1.4 2005/08/01 18:42:06 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: mod_random_pages.php,v 1.3 2005/07/17 17:36:46 squareing Exp $
+ * $Id: mod_random_pages.php,v 1.4 2005/08/01 18:42:06 squareing Exp $
  * @package wiki
  * @subpackage modules
  */
@@ -16,5 +16,5 @@ require_once( WIKI_PKG_PATH.'BitPage.php' );
 global $wikilib;
 
 $ranking = $wikilib->get_random_pages($module_rows);
-$smarty->assign('modRandomPages', $ranking);
+$gBitSmarty->assign('modRandomPages', $ranking);
 ?>
diff --git a/modules/mod_top_pages.php b/modules/mod_top_pages.php
index f56c7b6..c1ab50b 100644
--- a/modules/mod_top_pages.php
+++ b/modules/mod_top_pages.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * $Header: /cvsroot/bitweaver/_bit_wiki/modules/mod_top_pages.php,v 1.3 2005/07/25 20:02:58 squareing Exp $
+ * $Header: /cvsroot/bitweaver/_bit_wiki/modules/mod_top_pages.php,v 1.4 2005/08/01 18:42:06 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: mod_top_pages.php,v 1.3 2005/07/25 20:02:58 squareing Exp $
+ * $Id: mod_top_pages.php,v 1.4 2005/08/01 18:42:06 squareing Exp $
  * @package wiki
  * @subpackage modules
  */
@@ -21,5 +21,5 @@ global $wikilib, $modlib;
 
 $params = $modlib->get_module_params('bitpackage:blogs/mod_top_visited_blogs.tpl', $gQueryUserId);
 $ranking = $wikilib->getList(0, $params['rows'], 'hits_desc', '',$gQueryUserId,' `hits` IS NOT NULL ');
-$smarty->assign('modTopPages', $ranking["data"]);
+$gBitSmarty->assign('modTopPages', $ranking["data"]);
 ?>
diff --git a/modules/mod_top_pages.tpl b/modules/mod_top_pages.tpl
index 4f3ae07..48f0a6e 100644
--- a/modules/mod_top_pages.tpl
+++ b/modules/mod_top_pages.tpl
@@ -1,4 +1,4 @@
-{* $Header: /cvsroot/bitweaver/_bit_wiki/modules/mod_top_pages.tpl,v 1.3 2005/07/25 20:02:58 squareing Exp $ *}
+{* $Header: /cvsroot/bitweaver/_bit_wiki/modules/mod_top_pages.tpl,v 1.4 2005/08/01 18:42:06 squareing Exp $ *}
 {strip}
 {if $gBitSystem->isPackageActive( 'wiki' )}
 	{if $nonums eq 'y'}
@@ -16,4 +16,4 @@
 		<ol>
 	{/bitmodule}
 {/if}
-{/strip}
+{/strip}
\ No newline at end of file
diff --git a/modules/mod_wiki_last_comments.php b/modules/mod_wiki_last_comments.php
index 022e74e..2264528 100644
--- a/modules/mod_wiki_last_comments.php
+++ b/modules/mod_wiki_last_comments.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * $Header: /cvsroot/bitweaver/_bit_wiki/modules/mod_wiki_last_comments.php,v 1.2 2005/06/28 07:46:28 spiderr Exp $
+ * $Header: /cvsroot/bitweaver/_bit_wiki/modules/mod_wiki_last_comments.php,v 1.3 2005/08/01 18:42:06 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: mod_wiki_last_comments.php,v 1.2 2005/06/28 07:46:28 spiderr Exp $
+ * $Id: mod_wiki_last_comments.php,v 1.3 2005/08/01 18:42:06 squareing Exp $
  * @package wiki
  * @subpackage modules
  */
@@ -23,6 +23,6 @@ global $gQueryUserId;
 require_once( LIBERTY_PKG_PATH.'LibertyComment.php' );
 $cmt = new LibertyComment();
 $lastComments = $cmt->getList( array( 'max_records' => $module_rows, 'user_id' => $gQueryUserId, 'content_type_guid' => BITPAGE_CONTENT_TYPE_GUID ) );
-$smarty->assign('lastComments', $lastComments);
-$smarty->assign('moretooltips', isset($module_params["moretooltips"]) ? $module_params["moretooltips"] : 'n');
+$gBitSmarty->assign('lastComments', $lastComments);
+$gBitSmarty->assign('moretooltips', isset($module_params["moretooltips"]) ? $module_params["moretooltips"] : 'n');
 ?>