[Tikiwiki-cvs] tiki tiki-admin_include_wiki.php,1.26.2.10,1.26.2.11

[<mar...@us...>]

Update of /cvsroot/tikiwiki/tiki
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1465

Modified Files:
      Tag: BRANCH-1-9
	tiki-admin_include_wiki.php 
Log Message:
making wiki import pages optional (default off as it should always have been)

Index: tiki-admin_include_wiki.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/tiki-admin_include_wiki.php,v
retrieving revision 1.26.2.10
retrieving revision 1.26.2.11
diff -u -d -r1.26.2.10 -r1.26.2.11
--- tiki-admin_include_wiki.php	25 Mar 2005 23:10:53 -0000	1.26.2.10
+++ tiki-admin_include_wiki.php	27 Mar 2005 02:54:57 -0000	1.26.2.11
@@ -429,6 +429,15 @@
 		$smarty->assign("feature_wiki_icache", 'n');
 	}
 
+	if (isset($_REQUEST["feature_wiki_import_html"]) && $_REQUEST["feature_wiki_import_html"] == "on") {
+		$tikilib->set_preference("feature_wiki_import_html", 'y');
+
+		$smarty->assign("feature_wiki_import_html", 'y');
+	} else {
+		$tikilib->set_preference("feature_wiki_import_html", 'n');
+
+		$smarty->assign("feature_wiki_import_html", 'n');
+	}
 
 	if (isset($_REQUEST["wiki_creator_admin"]) && $_REQUEST["wiki_creator_admin"] == "on") {
 		$tikilib->set_preference("wiki_creator_admin", 'y');