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, master has been updated
via 3db16f62d3ddec95746f71b79948ac5248687786 (commit)
via 615e680dbd67bd39261e9c49337099e747ff0ba6 (commit)
from d58413878b5190e48104e04b121a04afe7e58d49 (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=3db16f62d3ddec95746f71b79948ac5248687786
commit 3db16f62d3ddec95746f71b79948ac5248687786
Author: Franck Villaume <[email protected]>
Date: Sat Apr 17 10:57:33 2021 +0200
fix Copyright
diff --git a/src/common/forum/ForumMessage.class.php
b/src/common/forum/ForumMessage.class.php
index b80c0c7..06afe1e 100644
--- a/src/common/forum/ForumMessage.class.php
+++ b/src/common/forum/ForumMessage.class.php
@@ -7,6 +7,7 @@
* Copyright 2009, Roland Mas
* Copyright 2013,2021, Franck Villaume - TrivialDev
* Copyright 2013, French Ministry of National Education
+ * Copyright 2021, Guy Morin - French Ministry of Finances, DGFiP
*
* This file is part of FusionForge. FusionForge is free software;
* you can redistribute it and/or modify it under the terms of the
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=615e680dbd67bd39261e9c49337099e747ff0ba6
commit 615e680dbd67bd39261e9c49337099e747ff0ba6
Author: Franck Villaume <[email protected]>
Date: Sat Apr 17 10:56:22 2021 +0200
fix query related to pinned feature in Forum
diff --git a/src/common/forum/ForumMessage.class.php
b/src/common/forum/ForumMessage.class.php
index 2346bca..b80c0c7 100644
--- a/src/common/forum/ForumMessage.class.php
+++ b/src/common/forum/ForumMessage.class.php
@@ -199,16 +199,16 @@ class ForumMessage extends FFError {
db_begin();
$is_pinned = 'f';
if (ForumHTML::getIsPinned($thread_id)) $is_pinned = 't';
- $result = db_query_params ('INSERT INTO forum
(group_forum_id,posted_by,subject,body,post_date,is_followup_to,thread_id,most_recent_date,is_pinned)
VALUES ($1,$2,$3,$4,$5,$6,$7,$8,$9)',
- array ($group_forum_id,
- $posted_by,
- htmlspecialchars($subject),
- $body,
- $post_date,
- $is_followup_to,
- $thread_id,
- $most_recent_date,
- $is_pinned)) ;
+ $result = db_query_params('INSERT INTO forum
(group_forum_id,posted_by,subject,body,post_date,is_followup_to,thread_id,most_recent_date,is_pinned)
VALUES ($1,$2,$3,$4,$5,$6,$7,$8,$9)',
+ array($group_forum_id,
+ $posted_by,
+ htmlspecialchars($subject),
+ $body,
+ $post_date,
+ $is_followup_to,
+ $thread_id,
+ $most_recent_date,
+ $is_pinned));
if (!$result || db_affected_rows($result) < 1) {
$this->setError(_('Posting Failed').' '.db_error());
@@ -300,18 +300,18 @@ class ForumMessage extends FFError {
}
}
- $is_pinned = 'f';
- if(ForumHTML::getIsPinned($thread_id)) $is_pinned = 't';
- $result = db_query_params ('INSERT INTO forum
(group_forum_id,posted_by,subject,body,post_date,is_followup_to,thread_id,most_recent_date)
VALUES ($1,$2,$3,$4,$5,$6,$7,$8,$9)',
- array ($this->Forum->getID(),
- $user_id,
- htmlspecialchars($subject),
- $body,
- $timestamp,
- $is_followup_to,
- $thread_id,
- $timestamp,
- $is_pinned)) ;
+ $is_pinned = 'f';
+ if(ForumHTML::getIsPinned($thread_id)) $is_pinned = 't';
+ $result = db_query_params('INSERT INTO forum
(group_forum_id,posted_by,subject,body,post_date,is_followup_to,thread_id,most_recent_date,
is_pinned) VALUES ($1,$2,$3,$4,$5,$6,$7,$8,$9)',
+ array($this->Forum->getID(),
+ $user_id,
+ htmlspecialchars($subject),
+ $body,
+ $timestamp,
+ $is_followup_to,
+ $thread_id,
+ $timestamp,
+ $is_pinned));
if (!$result || db_affected_rows($result) < 1) {
$this->setError(_('Posting Failed').' '.db_error());
db_rollback();
-----------------------------------------------------------------------
Summary of changes:
src/common/forum/ForumMessage.class.php | 45 +++++++++++++++++----------------
1 file changed, 23 insertions(+), 22 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
