From 1bc7c4bd0ff037069afa130882da2ace5d68b8d5 Mon Sep 17 00:00:00 2001
From: Thomas Hochstein <thh@inter.net>
Date: Sat, 17 Aug 2019 04:07:30 +0200
Subject: [PATCH] [event_spamblock] Don't overwrite "moderate" flag.

Unconditionally setting $serendipity['csuccess']
to 'true' will override a "moderate" flag set by
another (spamblock) plugin.

Cherry-picked from master.

Signed-off-by: Thomas Hochstein <thh@inter.net>
---
 plugins/serendipity_event_entryproperties/ChangeLog         | 4 ++++
 .../serendipity_event_entryproperties.php                   | 2 +-
 plugins/serendipity_event_spamblock/ChangeLog               | 2 ++
 .../serendipity_event_spamblock.php                         | 6 ++++--
 4 files changed, 11 insertions(+), 3 deletions(-)
 create mode 100644 plugins/serendipity_event_spamblock/ChangeLog

diff --git a/plugins/serendipity_event_entryproperties/ChangeLog b/plugins/serendipity_event_entryproperties/ChangeLog
index 46ba257e..4a5b4fde 100644
--- a/plugins/serendipity_event_entryproperties/ChangeLog
+++ b/plugins/serendipity_event_entryproperties/ChangeLog
@@ -1,3 +1,7 @@
+1.41.3:
+-------
+    * Add missing English language constant.
+
 1.38:
 -----
     * Fixed preview of extended properties by 1.37
diff --git a/plugins/serendipity_event_entryproperties/serendipity_event_entryproperties.php b/plugins/serendipity_event_entryproperties/serendipity_event_entryproperties.php
index 1a2b950a..2cda131f 100644
--- a/plugins/serendipity_event_entryproperties/serendipity_event_entryproperties.php
+++ b/plugins/serendipity_event_entryproperties/serendipity_event_entryproperties.php
@@ -19,7 +19,7 @@ class serendipity_event_entryproperties extends serendipity_event
         $propbag->add('description',   PLUGIN_EVENT_ENTRYPROPERTIES_DESC);
         $propbag->add('stackable',     false);
         $propbag->add('author',        'Garvin Hicking');
-        $propbag->add('version',       '1.41.2');
+        $propbag->add('version',       '1.41.3');
         $propbag->add('requirements',  array(
             'serendipity' => '1.6',
             'smarty'      => '2.6.27',
diff --git a/plugins/serendipity_event_spamblock/ChangeLog b/plugins/serendipity_event_spamblock/ChangeLog
new file mode 100644
index 00000000..365196d1
--- /dev/null
+++ b/plugins/serendipity_event_spamblock/ChangeLog
@@ -0,0 +1,2 @@
+1.88.2: Don't overwrite "moderate" flags from other plugins.
+        ($serendipity['csuccess'])
diff --git a/plugins/serendipity_event_spamblock/serendipity_event_spamblock.php b/plugins/serendipity_event_spamblock/serendipity_event_spamblock.php
index 94bba8d2..6df68e99 100644
--- a/plugins/serendipity_event_spamblock/serendipity_event_spamblock.php
+++ b/plugins/serendipity_event_spamblock/serendipity_event_spamblock.php
@@ -25,7 +25,7 @@ class serendipity_event_spamblock extends serendipity_event
             'smarty'      => '2.6.7',
             'php'         => '4.1.0'
         ));
-        $propbag->add('version',       '1.88.1');
+        $propbag->add('version',       '1.88.2');
         $propbag->add('event_hooks',    array(
             'frontend_saveComment' => true,
             'external_plugin'      => true,
@@ -876,7 +876,9 @@ class serendipity_event_spamblock extends serendipity_event
                     if (!is_array($eventData) || serendipity_db_bool($eventData['allow_comments'])) {
                         $this->checkScheme();
 
-                        $serendipity['csuccess'] = 'true';
+                        if (!isset($serendipity['csuccess'])) {
+                            $serendipity['csuccess'] = 'true';
+                        }
                         $logfile = $this->logfile = $this->get_config('logfile', $serendipity['serendipityPath'] . 'spamblock.log');
                         $required_fields = $this->get_config('required_fields', '');
                         $checkmail = $this->get_config('checkmail');