[Fusionforge-commits] FusionForge branch 6.0 updated. v6.0.2-22-g16ca676

Sylvain Beucler beuc-inria at libremir.placard.fr.eu.org
Wed Jul 15 16:01:53 CEST 2015


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".

The branch, 6.0 has been updated
       via  16ca676898e7fdfff5094fbe2271c9c26d05b305 (commit)
      from  11d686cd253547a7e2c4388bc22e6e09f588edc0 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=16ca676898e7fdfff5094fbe2271c9c26d05b305

commit 16ca676898e7fdfff5094fbe2271c9c26d05b305
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date:   Wed Jul 15 16:01:38 2015 +0200

    news: allow moderating news comments even if the Forum tool is disabled (Inria)

diff --git a/src/CHANGES b/src/CHANGES
index f7f6c5c..87c423d 100644
--- a/src/CHANGES
+++ b/src/CHANGES
@@ -2,6 +2,7 @@ Fusionforge 6.0.3:
 * Layout: fix rss url when url is absolute (TrivialDev)
 * Accounts: accept more elliptic curve ssh keys types (Unit 193 & Inria)
 * Docman: fix filesize sort [#784] (TrivialDev)
+* News: allow moderating news comments even if the Forum tool is disabled (Inria)
 
 FusionForge 6.0.2:
 * Accounts: fix elliptic curve ssh keys support (Inria)
diff --git a/src/www/forum/admin/index.php b/src/www/forum/admin/index.php
index 51f24e0..61bb228 100644
--- a/src/www/forum/admin/index.php
+++ b/src/www/forum/admin/index.php
@@ -54,7 +54,7 @@ $g = group_get_object($group_id);
 if (!$g || !is_object($g) || $g->isError()) {
 	exit_no_group();
 }
-if (!$g->usesForum()) {
+if (!$g->usesForum() and !$g->usesNews()) {
 	exit_error(sprintf(_('%s does not use the Forum tool.'), $g->getPublicName()), 'forums');
 }
 

-----------------------------------------------------------------------

Summary of changes:
 src/CHANGES                   | 1 +
 src/www/forum/admin/index.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list