[php-blog-cvs] serendipity serendipity_functions.inc.php,1.251,1.252

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

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

Modified Files:
	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.251
retrieving revision 1.252
diff -u -d -r1.251 -r1.252
--- serendipity_functions.inc.php	13 Apr 2004 06:38:49 -0000	1.251
+++ serendipity_functions.inc.php	13 Apr 2004 12:33:40 -0000	1.252
@@ -653,7 +653,7 @@
     if ($fetchDrafts == 'false') {
         $drafts = "AND isdraft = 'false'";
     }
-    
+
     $admin = '';
     if (isset($serendipity['GET']['adminModule']) && $serendipity['GET']['adminModule'] == 'entries' && $serendipity['serendipityUserlevel'] < USERLEVEL_CHIEF) {
         $admin = " AND e.authorid = '" . $serendipity['authorid'] . "'";
@@ -703,12 +703,12 @@
 
 function serendipity_fetchUsers($user = '') {
     global $serendipity;
-    
+
     $where = '';
     if (!empty($user)) {
         $where = 'WHERE authorid = ' . serendipity_db_escape_string($user);
     }
-    
+
     $querystring = "SELECT * FROM {$serendipity['dbPrefix']}authors $where ORDER BY username ASC";
 
     return serendipity_db_query($querystring);
@@ -1914,7 +1914,7 @@
     if (!isset($entry['authorid']) || empty($entry['authorid'])) {
         $entry['authorid'] = $serendipity['authorid'];
     }
-    
+
     if (!is_numeric($entry['id'])) {
         /* we need to insert */
 
@@ -1977,7 +1977,7 @@
         // Only admins and chief users can delete entries which do not belong to the author
         return;
     }
-    
+
     serendipity_purgeEntry($id, $result[0]);
 
     serendipity_db_query("DELETE FROM {$serendipity["dbPrefix"]}entries WHERE id=$id");
@@ -2411,7 +2411,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>
@@ -2423,12 +2423,14 @@
     $csscode = str_replace(
                  array(
                    "\n",
-                   "'"
+                   "'",
+                   "\r"
                  ),
 
                  array(
                    '\n',
                    "\'",
+                   ""
                  ),
 
                  file_get_contents(serendipity_getTemplateFile('htmlarea.css', 'serendipityPath'))