[phpws-comm-commits] modules/xwysiwyg/mod/xwysiwyg/class xwysiwyg.php,1.6,1.7

[Yves K. <yku...@us...>]

Update of /cvsroot/phpwebsite-comm/modules/xwysiwyg/mod/xwysiwyg/class
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8552/modules/xwysiwyg/mod/xwysiwyg/class

Modified Files:
	xwysiwyg.php 
Log Message:
path and CDATA bugfix

Index: xwysiwyg.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/xwysiwyg/mod/xwysiwyg/class/xwysiwyg.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** xwysiwyg.php	31 Oct 2004 19:52:05 -0000	1.6
--- xwysiwyg.php	2 Nov 2004 21:42:02 -0000	1.7
***************
*** 151,155 ****
  		// HtmlArea-Main for all Modes
  		$main		= "
! <script type=\"text/javascript\">\n//<[[CDATA
  	_editor_lang = \"".$lang."\";
  	_editor_url = \"http://".PHPWS_SOURCE_HTTP."mod/xwysiwyg/_htmlarea/\";
--- 151,155 ----
  		// HtmlArea-Main for all Modes
  		$main		= "
! <script type=\"text/javascript\">\n//<![CDATA[
  	_editor_lang = \"".$lang."\";
  	_editor_url = \"http://".PHPWS_SOURCE_HTTP."mod/xwysiwyg/_htmlarea/\";
***************
*** 157,161 ****
  <!-- load the main HTMLArea files -->
  <script type=\"text/javascript\" src=\"http://".PHPWS_SOURCE_HTTP."mod/xwysiwyg/_htmlarea/htmlarea.js\"></script>
! <script type=\"text/javascript\">\n//<[[CDATA
  ".$loadplugs;
  
--- 157,161 ----
  <!-- load the main HTMLArea files -->
  <script type=\"text/javascript\" src=\"http://".PHPWS_SOURCE_HTTP."mod/xwysiwyg/_htmlarea/htmlarea.js\"></script>
! <script type=\"text/javascript\">\n//<![CDATA[
  ".$loadplugs;
  
***************
*** 177,182 ****
  		$main		= "
  <!-- load the main FCKeditor files -->
! <script type=\"text/javascript\" src=\"http://".PHPWS_SOURCE_HTTP."mod/fckeditor/fck/fckeditor.js\"></script>
! <script type=\"text/javascript\">\n//<[[CDATA
  ".$loadplugs;
  
--- 177,182 ----
  		$main		= "
  <!-- load the main FCKeditor files -->
! <script type=\"text/javascript\" src=\"http://".PHPWS_SOURCE_HTTP."mod/xwysiwyg/_fck/fckeditor.js\"></script>
! <script type=\"text/javascript\">\n//<![CDATA[
  ".$loadplugs;
  
***************
*** 216,220 ****
  	$main = PHPWS_xwysiwyg::makeMain($settings,$editors,$loadplugs,$lang);
  	}
! 	$main = "//]]>\n</script>".$main."<script type=\"text/javascript\">\n//<[[CDATA"; //ugly hack to work with $GLOBALS['core']->js_func[]
  	return $main;
  }
--- 216,220 ----
  	$main = PHPWS_xwysiwyg::makeMain($settings,$editors,$loadplugs,$lang);
  	}
! 	$main = "//]]>\n</script>".$main."<script type=\"text/javascript\">\n//<![CDATA["; //ugly hack to work with $GLOBALS['core']->js_func[]
  	return $main;
  }