[php-blog-cvs] serendipity serendipity_functions.inc.php,1.248.4.1,1.248.4.2

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16845

Modified Files:
      Tag: branch_0_6
	serendipity_functions.inc.php 
Log Message:
Fix wysiwyg-language


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.248.4.1
retrieving revision 1.248.4.2
diff -u -d -r1.248.4.1 -r1.248.4.2
--- serendipity_functions.inc.php	7 Apr 2004 12:38:18 -0000	1.248.4.1
+++ serendipity_functions.inc.php	13 Apr 2004 12:33:37 -0000	1.248.4.2
@@ -2362,7 +2362,7 @@
 ?>
     <script type="text/javascript">
         _editor_url = "<?php echo $serendipity['serendipityHTTPPath'] . 'htmlarea/'; ?>";
-        _editor_lang = "<?php echo $serendipity['lang']; ?>";
+        _editor_lang = "<?php echo WYSIWYG_LANG; ?>";
         var editorref = '';
     </script>
     <script type="text/javascript" src="htmlarea/htmlarea.js"></script>
@@ -2374,12 +2374,14 @@
     $csscode = str_replace(
                  array(
                    "\n",
-                   "'"
+                   "'",
+                   "\r"
                  ),
 
                  array(
                    '\n',
                    "\'",
+                   ""
                  ),
 
                  file_get_contents(serendipity_getTemplateFile('htmlarea.css', 'serendipityPath'))