[Tikiwiki-cvs] tiki tiki-admin.php,1.88.2.1,1.88.2.2

[<oh...@us...>]

Update of /cvsroot/tikiwiki/tiki
In directory sc8-pr-cvs1:/tmp/cvs-serv18964/tiki

Modified Files:
      Tag: release_eta_carinea_rc1
	tiki-admin.php 
Log Message:
feature_wikiwords: Usage of WikiWords can be switched on/off,
closed RFE [ 750114 ]: Don't generate wiki reference for hyphenated words

Index: tiki-admin.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/tiki-admin.php,v
retrieving revision 1.88.2.1
retrieving revision 1.88.2.2
diff -u -d -r1.88.2.1 -r1.88.2.2
--- tiki-admin.php	16 Jul 2003 23:59:55 -0000	1.88.2.1
+++ tiki-admin.php	21 Jul 2003 22:03:10 -0000	1.88.2.2
@@ -502,9 +502,9 @@
     $smarty->assign('feature_challenge','y');
   } else {
     $tikilib->set_preference("feature_challenge",'n');
-    $smarty->assign('feature_challenge','n');
+    $smarty->assign('feature_challenge','n');    
   }
-  
+
   if(isset($_REQUEST["feature_clear_passwords"]) && $_REQUEST["feature_clear_passwords"]=="on") {
     $tikilib->set_preference("feature_clear_passwords",'y'); 
     $smarty->assign('feature_clear_passwords','y');
@@ -1272,6 +1272,14 @@
   } else {
     $tikilib->set_preference("feature_page_title",'n');
     $smarty->assign("feature_page_title",'n');
+  }
+
+  if(isset($_REQUEST["feature_wikiwords"]) && $_REQUEST["feature_wikiwords"]=="on") {
+    $tikilib->set_preference("feature_wikiwords",'y'); 
+    $smarty->assign('feature_wikiwords','y');
+  } else {
+    $tikilib->set_preference("feature_wikiwords",'n');
+    $smarty->assign('feature_wikiwords','n');    
   }
   
   $tikilib->set_preference('wiki_cache',$_REQUEST["wiki_cache"]);