1.1 --- a/public_html/admin/moderation.php	Sat Oct 17 13:01:42 2009 +0200
     1.2 +++ b/public_html/admin/moderation.php	Sat Oct 17 13:11:32 2009 +0200
     1.3 @@ -742,24 +742,28 @@
     1.4  // MAIN
     1.5  
     1.6  $display = '';
     1.7 -$display .= COM_siteHeader ('menu', $LANG29[34]);
     1.8 -$display .= COM_showMessageFromParameter();
     1.9  
    1.10 -if (isset ($_POST['mode']) && ($_POST['mode'] == 'moderation') && SEC_checkToken()) {
    1.11 +if (isset($_POST['mode']) && ($_POST['mode'] == 'moderation') &&
    1.12 +        SEC_checkToken()) {
    1.13      $action = array();
    1.14      if (isset($_POST['action'])) {
    1.15          $action = $_POST['action'];
    1.16      }
    1.17      if ($_POST['type'] == 'user') {
    1.18 -        $display .= moderateusers($_POST['id'], $action,
    1.19 -                                  COM_applyFilter($_POST['count'], true));
    1.20 +        $mod_result = moderateusers($_POST['id'], $action,
    1.21 +                                    COM_applyFilter($_POST['count'], true));
    1.22      } else {
    1.23 -        $display .= moderation($_POST['id'], $action, $_POST['type'],
    1.24 -                               COM_applyFilter ($_POST['count'], true));
    1.25 +        $mod_result = moderation($_POST['id'], $action, $_POST['type'],
    1.26 +                                 COM_applyFilter($_POST['count'], true));
    1.27      }
    1.28 +    $display .= COM_siteHeader('menu', $LANG29[34])
    1.29 +             .  COM_showMessageFromParameter()
    1.30 +             .  $mod_result;
    1.31  } else {
    1.32 -    $display .= security_check_reminder();
    1.33 -    $display .= commandcontrol(SEC_createToken());
    1.34 +    $display .= COM_siteHeader('menu', $LANG29[34])
    1.35 +             .  COM_showMessageFromParameter()
    1.36 +             .  security_check_reminder()
    1.37 +             .  commandcontrol(SEC_createToken());
    1.38  }
    1.39  
    1.40  $display .= COM_siteFooter();

     2.1 --- a/public_html/docs/history	Sat Oct 17 13:01:42 2009 +0200
     2.2 +++ b/public_html/docs/history	Sat Oct 17 13:11:32 2009 +0200
     2.3 @@ -3,6 +3,9 @@
     2.4  Oct ??, 2009 (1.6.1)
     2.5  ------------
     2.6  
     2.7 +- Fixed a long-standing quirk of the submission handling where the "Submissions"
     2.8 +  entry in the Admins Block wasn't updated after accepting / rejecting a
     2.9 +  submission [Dirk]
    2.10  - Added new option $_CONF['article_comment_close_enabled'] to enable/disable
    2.11    automatically closing stories for comments after a certain amount of days
    2.12    (bug #0000959). Changed handling of comment_expire field in gl_stories such