Merge recent changes from R1 to HEAD - never doing this again.

6 files changed, 19 insertions, 18 deletions

diff --git a/modules/mod_breadcrumb.tpl b/modules/mod_breadcrumb.tpl
index 5309326..a3f1a9c 100644
--- a/modules/mod_breadcrumb.tpl
+++ b/modules/mod_breadcrumb.tpl
@@ -1,6 +1,6 @@
-{* $Header: /cvsroot/bitweaver/_bit_wiki/modules/Attic/mod_breadcrumb.tpl,v 1.1 2005/06/19 06:12:45 bitweaver Exp $ *}
+{* $Header: /cvsroot/bitweaver/_bit_wiki/modules/Attic/mod_breadcrumb.tpl,v 1.2 2005/07/17 17:36:46 squareing Exp $ *}
 {strip}
-{if $gBitSystemPrefs.feature_featuredLinks eq 'y'}
+{if $gBitSystem->isFeatureActive( 'feature_featuredLinks' )}
 	{bitmodule title="$moduleTitle" name="breadcrumb"}
 		<ol class="wiki">
 			{section name=ix loop=$breadCrumb}
diff --git a/modules/mod_comm_received_objects.tpl b/modules/mod_comm_received_objects.tpl
index ee4431f..4f2c697 100644
--- a/modules/mod_comm_received_objects.tpl
+++ b/modules/mod_comm_received_objects.tpl
@@ -1,5 +1,5 @@
-{* $Header: /cvsroot/bitweaver/_bit_wiki/modules/mod_comm_received_objects.tpl,v 1.1 2005/06/19 06:12:45 bitweaver Exp $ *}
-{if $gBitSystemPrefs.feature_comm eq 'y'}
+{* $Header: /cvsroot/bitweaver/_bit_wiki/modules/mod_comm_received_objects.tpl,v 1.2 2005/07/17 17:36:46 squareing Exp $ *}
+{if $gBitSystem->isFeatureActive( 'feature_comm' )}
 {bitmodule title="$moduleTitle" name="comm_received_objects"}
 	<table class="module box"><tr>
 		<td valign="top">{tr}Pages:{/tr}</td>
diff --git a/modules/mod_last_modif_pages.tpl b/modules/mod_last_modif_pages.tpl
index 5e81aea..7243d38 100644
--- a/modules/mod_last_modif_pages.tpl
+++ b/modules/mod_last_modif_pages.tpl
@@ -1,6 +1,6 @@
-{* $Header: /cvsroot/bitweaver/_bit_wiki/modules/mod_last_modif_pages.tpl,v 1.1 2005/06/19 06:12:45 bitweaver Exp $ *}
+{* $Header: /cvsroot/bitweaver/_bit_wiki/modules/mod_last_modif_pages.tpl,v 1.2 2005/07/17 17:36:46 squareing Exp $ *}
 {strip}
-{if $gBitSystemPrefs.package_wiki eq 'y'}
+{if $gBitSystem->isPackageActive( 'wiki' )}
 	{if $nonums eq 'y'}
 		{eval var="{tr}Last `$module_rows` changes{/tr}" assign="tpl_module_title"}
 	{else}
diff --git a/modules/mod_random_pages.php b/modules/mod_random_pages.php
index 4f8a9a0..174f5e6 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.2 2005/06/28 07:46:28 spiderr Exp $
+ * $Header: /cvsroot/bitweaver/_bit_wiki/modules/mod_random_pages.php,v 1.3 2005/07/17 17:36:46 squareing Exp $
  *
  * Copyright (c) 2004 bitweaver.org
  * Copyright (c) 2003 tikwiki.org
@@ -8,12 +8,13 @@
  * 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.2 2005/06/28 07:46:28 spiderr Exp $
+ * $Id: mod_random_pages.php,v 1.3 2005/07/17 17:36:46 squareing Exp $
  * @package wiki
  * @subpackage modules
  */
+require_once( WIKI_PKG_PATH.'BitPage.php' );
 global $wikilib;
 
 $ranking = $wikilib->get_random_pages($module_rows);
 $smarty->assign('modRandomPages', $ranking);
-?>
\ No newline at end of file
+?>
diff --git a/modules/mod_random_pages.tpl b/modules/mod_random_pages.tpl
index 0bb846e..72299e2 100644
--- a/modules/mod_random_pages.tpl
+++ b/modules/mod_random_pages.tpl
@@ -1,14 +1,14 @@
-{* $Header: /cvsroot/bitweaver/_bit_wiki/modules/mod_random_pages.tpl,v 1.1 2005/06/19 06:12:45 bitweaver Exp $ *}
+{* $Header: /cvsroot/bitweaver/_bit_wiki/modules/mod_random_pages.tpl,v 1.2 2005/07/17 17:36:46 squareing Exp $ *}
 {strip}
-{if $gBitSystemPrefs.package_wiki eq 'y'}
+{if $gBitSystem->isPackageActive( 'wiki' )}
 	{bitmodule title="$moduleTitle" name="random_pages"}
 		<ol class="wiki">
-			{section name=ix loop=$modRandomPages}
-				<li><a href="{$gBitLoc.WIKI_PKG_URL}index.php?page={$modRandomPages[ix]}">{$modRandomPages[ix]}</a></li>
-			{sectionelse}
+			{foreach from=$modRandomPages key=contentId item=pageHash}
+				<li><a href="{$modRandomPages.$contentId.display_url}">{$modRandomPages.$contentId.title}</a></li>
+			{foreachelse}
 				<li></li>
-			{/section}
+			{/foreach}
 		</ol>
 	{/bitmodule}
 {/if}
-{/strip}
\ No newline at end of file
+{/strip}
diff --git a/modules/mod_top_pages.tpl b/modules/mod_top_pages.tpl
index c958722..7cd1c12 100644
--- a/modules/mod_top_pages.tpl
+++ b/modules/mod_top_pages.tpl
@@ -1,6 +1,6 @@
-{* $Header: /cvsroot/bitweaver/_bit_wiki/modules/mod_top_pages.tpl,v 1.1 2005/06/19 06:12:45 bitweaver Exp $ *}
+{* $Header: /cvsroot/bitweaver/_bit_wiki/modules/mod_top_pages.tpl,v 1.2 2005/07/17 17:36:46 squareing Exp $ *}
 {strip}
-{if $gBitSystemPrefs.package_wiki eq 'y'}
+{if $gBitSystem->isPackageActive( 'wiki' )}
 	{if $nonums eq 'y'}
 		{eval var="{tr}Top `$module_rows` Pages{/tr}" assign="tpl_module_title"}
 	{else}