[geeklog-cvs] geeklog: Merging with Tom's latest changes

[geeklog-cvs at lists.geeklog.net]

changeset 8248:c2b2c64f6908
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/c2b2c64f6908
user: Dirk Haun <dirk at haun-online.de>
date: Fri Apr 22 19:49:33 2011 +0200
description:
Merging with Tom's latest changes

diffstat:

 public_html/docs/history |  4 +++-
 system/lib-comment.php   |  2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diffs (31 lines):

diff -r 3b6e87e0f0af -r c2b2c64f6908 public_html/docs/history
--- a/public_html/docs/history	Fri Apr 22 19:47:45 2011 +0200
+++ b/public_html/docs/history	Fri Apr 22 19:49:33 2011 +0200
@@ -1,12 +1,14 @@
 Geeklog History/Changes:
 
-Apr 2?, 2011 (1.8.0b1)
+Apr 2?, 2011 (1.8.0b2)
 ------------
 
 This release includes the results from the 2010 Google Summer of Code project
 to improve the Configuration (input validation, searching), implemented by
 Akeda Bagus.
 
+- Fixed post mode being switched when plain text comment was previewed or edited
+  (bug #0001324) [Tom]
 - Sanitize OAuth user data (bug #0001322) [Dirk]
 - Fixed HTML errors in Configuration (bug #0001318, patch provided by dengen)
   [Tom, Rouslan]
diff -r 3b6e87e0f0af -r c2b2c64f6908 system/lib-comment.php
--- a/system/lib-comment.php	Fri Apr 22 19:47:45 2011 +0200
+++ b/system/lib-comment.php	Fri Apr 22 19:49:33 2011 +0200
@@ -778,7 +778,7 @@
                 . COM_endBlock (COM_getBlockTemplate ('_msg_block', 'footer'));
         } else {
 
-            if ($_CONF['advanced_editor'] && $_USER['advanced_editor']) {
+            if (empty($postmode) && $_CONF['advanced_editor'] && $_USER['advanced_editor']) {
                 $postmode = 'html';
             } elseif (empty($postmode)) {
                 $postmode = $_CONF['postmode'];