merge recent changes into HEAD

2 files changed, 10 insertions, 7 deletions

diff --git a/admin/admin_wiki_inc.php b/admin/admin_wiki_inc.php
index 336afd7..3e3a905 100644
--- a/admin/admin_wiki_inc.php
+++ b/admin/admin_wiki_inc.php
@@ -1,5 +1,5 @@
 <?php
-// $Header: /cvsroot/bitweaver/_bit_wiki/admin/admin_wiki_inc.php,v 1.7 2006/01/14 19:56:31 squareing Exp $
+// $Header: /cvsroot/bitweaver/_bit_wiki/admin/admin_wiki_inc.php,v 1.8 2006/01/17 00:23:45 squareing Exp $
 // Copyright (c) 2002-2003, Luis Argerich, Garland Foster, Eduardo Polidor, et. al.
 // 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.
@@ -66,7 +66,7 @@ $gBitSmarty->assign( 'formWikiLists',$formWikiLists );
 if (isset($_REQUEST["wikilistconf"])) {
 
 	foreach( $formWikiLists as $item => $data ) {
-		simple_set_toggle( $item );
+		simple_set_toggle( $item, WIKI_PKG_NAME );
 	}
 }
 
@@ -141,7 +141,7 @@ $gBitSmarty->assign( 'formWikiFeatures',$formWikiFeatures );
 if (isset($_REQUEST["wikifeatures"])) {
 
 	foreach( $formWikiFeatures as $item => $data ) {
-		simple_set_toggle( $item,'wiki' );
+		simple_set_toggle( $item, WIKI_PKG_NAME );
 	}
 	if (isset($_REQUEST["feature_warn_on_edit"]) && $_REQUEST["feature_warn_on_edit"] == "y") {
 		$gBitSystem->storePreference("feature_warn_on_edit", 'y');
@@ -226,7 +226,7 @@ $gBitSmarty->assign( 'formWikiInOut',$formWikiInOut );
 if (isset($_REQUEST["wikiinout"])) {
 
 	foreach( $formWikiInOut as $item => $data ) {
-		simple_set_toggle( $item,'wiki' );
+		simple_set_toggle( $item, WIKI_PKG_NAME );
 	}
 }
 
@@ -257,7 +257,7 @@ $gBitSmarty->assign( 'formWikiBooks',$formWikiBooks );
 if (isset($_REQUEST["wikibooks"])) {
 
 	foreach( $formWikiBooks as $item => $data ) {
-		simple_set_toggle( $item,'wiki' );
+		simple_set_toggle( $item, WIKI_PKG_NAME );
 	}
 }
 
@@ -280,7 +280,7 @@ $gBitSmarty->assign( 'formWikiWatch',$formWikiWatch );
 if (isset($_REQUEST["wikiwatch"])) {
 
 	foreach( $formWikiWatch  as $item => $data ) {
-		simple_set_toggle( $item,'wiki' );
+		simple_set_toggle( $item, WIKI_PKG_NAME );
 	}
 }
 
diff --git a/wiki_rss.php b/wiki_rss.php
index 0b04c06..5d35148 100644
--- a/wiki_rss.php
+++ b/wiki_rss.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version $Header: /cvsroot/bitweaver/_bit_wiki/wiki_rss.php,v 1.5 2005/12/26 12:27:43 squareing Exp $
+ * @version $Header: /cvsroot/bitweaver/_bit_wiki/wiki_rss.php,v 1.6 2006/01/17 00:23:45 squareing Exp $
  * @package wiki
  * @subpackage functions
  */
@@ -30,6 +30,9 @@ if( !$gBitUser->hasPermission( 'bit_p_view' ) ) {
 	$feeds = $wiki->getList( 0, $gBitSystem->getPreference( 'max_rss_wiki', 10 ), 'last_modified_desc', NULL, NULL, FALSE, FALSE, TRUE );
 	$feeds = $feeds['data'];
 
+	// set the rss link
+	$rss->link = 'http://'.$_SERVER['HTTP_HOST'].WIKI_PKG_URL;
+
 	// get all the data ready for the feed creator
 	foreach( $feeds as $feed ) {
 		$item = new FeedItem();