[Tikiwiki-cvs] tiki tiki-parsemode_setup.php,1.3,1.4

[<sy...@us...>]

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

Modified Files:
	tiki-parsemode_setup.php 
Log Message:
[FIX]wiki: is_html was forced to true if wysiwyg is on but not used

Index: tiki-parsemode_setup.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/tiki-parsemode_setup.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- tiki-parsemode_setup.php	29 Dec 2006 00:00:26 -0000	1.3
+++ tiki-parsemode_setup.php	10 Jul 2007 14:45:26 -0000	1.4
@@ -1,4 +1,5 @@
 <?php
+// $Header$
 
 if (strpos($_SERVER['SCRIPT_NAME'],basename(__FILE__)) != FALSE) { header('location: index.php'); exit; }
 
@@ -9,11 +10,20 @@
 	} elseif ($wysiwyg_optional == 'y' and isset($_REQUEST['wysiwyg']) and $_REQUEST['wysiwyg'] == 'n') {
 		$_SESSION['wysiwyg'] = 'n';
 	}
+} else {
+	$_SESSION['wysiwyg'] = 'n';
+}
+if ($_SESSION['wysiwyg'] == 'y') {
 	$is_html = true;
 } elseif ($feature_wiki_allowhtml == 'y' and ($tiki_p_admin == 'y' or $tiki_p_use_HTML == 'y')) {
-	$_SESSION['wysiwyg'] = 'n';
-	if ((isset($info['is_html']) and $info['is_html']) or (isset($_REQUEST["allowhtml"]) && $_REQUEST["allowhtml"] == "on")) {
-		$is_html = true;
+	if (isset($_REQUEST['preview']) || isset($_REQUEST['edit'])) {
+		if (isset($_REQUEST["allowhtml"]) && $_REQUEST["allowhtml"] == "on") {
+			$is_html = true;
+		}
+	} else {
+		if ((isset($info['is_html']) and $info['is_html'])) {
+			$is_html = true;
+		}
 	}
 }
 ?>