[LON-CAPA-cvs] cvs: loncom /interface lonhtmlcommon.pm

[faziophi]

faziophi		Fri Jan  8 22:05:43 2010 EDT

  Modified files:              
    /loncom/interface	lonhtmlcommon.pm 
  Log:
  Bug 6179
      Rich Text Editor should not respect old WYSIWYG preference
  
  
Index: loncom/interface/lonhtmlcommon.pm
diff -u loncom/interface/lonhtmlcommon.pm:1.259 loncom/interface/lonhtmlcommon.pm:1.260
--- loncom/interface/lonhtmlcommon.pm:1.259	Thu Jan  7 16:15:59 2010
+++ loncom/interface/lonhtmlcommon.pm	Fri Jan  8 22:05:42 2010
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common html routines
 #
-# $Id: lonhtmlcommon.pm,v 1.259 2010/01/07 16:15:59 faziophi Exp $
+# $Id: lonhtmlcommon.pm,v 1.260 2010/01/08 22:05:42 faziophi Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1241,7 +1241,7 @@
 
 sub htmlareaheaders {
 	my $s="";
-	if (!&htmlareablocked() && &htmlareabrowser()) {
+	if (&htmlareabrowser()) {
 		$s.=(<<ENDEDITOR);
 <script type="text/javascript" src="/fckeditor/fckeditor.js"></script>
 <script type="text/javascript" src="/ckeditor/ckeditor.js"></script>
@@ -1287,7 +1287,7 @@
 sub htmlareaselectactive {
     my @fields=@_;
     unless (&htmlareabrowser()) { return ''; }
-    if (&htmlareablocked()) { return '<br />'.&enablelink(@fields); }
+    #if (&htmlareablocked()) { return '<br />'.&enablelink(@fields); }
     my $output='<script type="text/javascript" defer="1">'."\n"
               .'// <![CDATA['."\n";
     my $lang = &htmlarea_lang();