[geeklog-cvs] geeklog: Fixed a long-standing quirk of the submission handling ...

[geeklog-cvs at lists.geeklog.net]

changeset 7379:d9ce993e1951
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/d9ce993e1951
user: Dirk Haun <dirk at haun-online.de>
date: Sat Oct 17 13:11:32 2009 +0200
description:
Fixed a long-standing quirk of the submission handling where the "Submissions" entry in the Admins Block wasn't updated after accepting / rejecting a submission

diffstat:

 public_html/admin/moderation.php |  22 +++++++++++++---------
 public_html/docs/history         |   3 +++
 2 files changed, 16 insertions(+), 9 deletions(-)

diffs (54 lines):

diff -r 5c0a38462d53 -r d9ce993e1951 public_html/admin/moderation.php
--- a/public_html/admin/moderation.php	Sat Oct 17 13:01:42 2009 +0200
+++ b/public_html/admin/moderation.php	Sat Oct 17 13:11:32 2009 +0200
@@ -742,24 +742,28 @@
 // MAIN
 
 $display = '';
-$display .= COM_siteHeader ('menu', $LANG29[34]);
-$display .= COM_showMessageFromParameter();
 
-if (isset ($_POST['mode']) && ($_POST['mode'] == 'moderation') && SEC_checkToken()) {
+if (isset($_POST['mode']) && ($_POST['mode'] == 'moderation') &&
+        SEC_checkToken()) {
     $action = array();
     if (isset($_POST['action'])) {
         $action = $_POST['action'];
     }
     if ($_POST['type'] == 'user') {
-        $display .= moderateusers($_POST['id'], $action,
-                                  COM_applyFilter($_POST['count'], true));
+        $mod_result = moderateusers($_POST['id'], $action,
+                                    COM_applyFilter($_POST['count'], true));
     } else {
-        $display .= moderation($_POST['id'], $action, $_POST['type'],
-                               COM_applyFilter ($_POST['count'], true));
+        $mod_result = moderation($_POST['id'], $action, $_POST['type'],
+                                 COM_applyFilter($_POST['count'], true));
     }
+    $display .= COM_siteHeader('menu', $LANG29[34])
+             .  COM_showMessageFromParameter()
+             .  $mod_result;
 } else {
-    $display .= security_check_reminder();
-    $display .= commandcontrol(SEC_createToken());
+    $display .= COM_siteHeader('menu', $LANG29[34])
+             .  COM_showMessageFromParameter()
+             .  security_check_reminder()
+             .  commandcontrol(SEC_createToken());
 }
 
 $display .= COM_siteFooter();
diff -r 5c0a38462d53 -r d9ce993e1951 public_html/docs/history
--- a/public_html/docs/history	Sat Oct 17 13:01:42 2009 +0200
+++ b/public_html/docs/history	Sat Oct 17 13:11:32 2009 +0200
@@ -3,6 +3,9 @@
 Oct ??, 2009 (1.6.1)
 ------------
 
+- Fixed a long-standing quirk of the submission handling where the "Submissions"
+  entry in the Admins Block wasn't updated after accepting / rejecting a
+  submission [Dirk]
 - Added new option $_CONF['article_comment_close_enabled'] to enable/disable
   automatically closing stories for comments after a certain amount of days
   (bug #0000959). Changed handling of comment_expire field in gl_stories such