[php-blog-cvs] serendipity NEWS,1.152,1.153 index.php,1.39,1.40 serendipity_functions.inc.php,1.295,1.296

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

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

Modified Files:
	NEWS index.php serendipity_functions.inc.php 
Log Message:
pl3 release (still...don't find the time to create the release and test it. WIll someone do QA for me? :-))
fix empty extended entry with WYSIWYG tool


Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -d -r1.152 -r1.153
--- NEWS	18 Jun 2004 15:49:30 -0000	1.152
+++ NEWS	18 Jun 2004 16:53:26 -0000	1.153
@@ -15,9 +15,6 @@
 
     * Tweaks to plugin configuration design (tomsommer)
 
-    * Fix bug during installation, which can cause an endless loop
-      of connections (tomsommer)
-
     * Added small comments to serendipity_functions.inc.php on how
       to enable the spellchecker module of the WYSIWYG editor.
       (Suggestion by Randall)
@@ -35,10 +32,6 @@
 
     * Simple OPML 1.0 outline feed (Richard Harrison, garvinhicking)
 
-    * Removed german blogbot pinging service, it was shut down (nohn)
-
-    * Allow pinging of blogbot.dk (tomsommer)
-
     * Fixed variable namespace problems in Textile Event plugin
       (Reimer Behrends, garvinhicking)
 
@@ -56,10 +49,6 @@
     * Threaded comments.
       (Evan Nemerson)                       [DB Layout change - > 0.6.5]
 
-    * WYSIWYG-Editor: Links were prefixed with '/' wrongly (IE only).
-      Now all entered links will be put to an absolute URL consistently.
-      (garvinhicking)
-
     * Minor https fixes, when https is used as links from commenting
       users or in referring/exit links. Fix for RPC-ping function submitting
       double http://http:// URLs. (garvinhicking)
@@ -216,6 +205,21 @@
 
     * Configuration is now language-dependant. (garvinhicking)
 
+Version 0.6-pl3 ()
+------------------------------------------------------------------------
+
+    * WYSIWYG-Editor: Links were prefixed with '/' wrongly (IE only).
+      Now all entered links will be put to an absolute URL consistently.
+      Fix always inserting extended body with empty '<br />'
+      (garvinhicking)
+
+    * Fix bug during installation, which can cause an endless loop
+      of connections (tomsommer)
+
+    * Removed german blogbot pinging service, it was shut down (nohn)
+
+    * Allow pinging of blogbot.dk (tomsommer)
+
 Version 0.6-pl2 (May 24th, 2004)
 ------------------------------------------------------------------------
 

Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.295
retrieving revision 1.296
diff -u -d -r1.295 -r1.296
--- serendipity_functions.inc.php	18 Jun 2004 15:43:59 -0000	1.295
+++ serendipity_functions.inc.php	18 Jun 2004 16:53:26 -0000	1.296
@@ -2253,6 +2253,11 @@
         $entry['last_modified'] = time();
     }
 
+    /* WYSIWYG-editor inserts empty '<br />' for extended body; this is reversed here */
+    if (isset($entry['extended']) && trim($entry['extended']) == '<br />') {
+        $entry['extended'] = '';
+    }
+
     if (strlen($entry['extended'])) {
         $exflag = 1;
     }