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 7e397e62da5a2e7494bb7705bc02c6f6fa572e97 (commit)
from 4935ce443c97907c1cba238475201824d01c0c2b (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=7e397e62da5a2e7494bb7705bc02c6f6fa572e97
commit 7e397e62da5a2e7494bb7705bc02c6f6fa572e97
Author: Franck Villaume <[email protected]>
Date: Sat Apr 10 13:16:30 2021 +0200
fix PHP warning. Ordering params in function
diff --git a/src/common/forum/ForumMessage.class.php
b/src/common/forum/ForumMessage.class.php
index 56e1cac..2346bca 100644
--- a/src/common/forum/ForumMessage.class.php
+++ b/src/common/forum/ForumMessage.class.php
@@ -5,7 +5,7 @@
* Copyright 1999-2000, Tim Perdue/Sourceforge
* Copyright 2002, Tim Perdue/GForge, LLC
* Copyright 2009, Roland Mas
- * Copyright 2013, Franck Villaume - TrivialDev
+ * Copyright 2013,2021, Franck Villaume - TrivialDev
* Copyright 2013, French Ministry of National Education
*
* This file is part of FusionForge. FusionForge is free software;
@@ -94,14 +94,14 @@ class ForumMessage extends FFError {
/**
* insertmoderated - inserts the message into the table for moderation
(forum_pending_messages)
*
- * @param string $subject The subject of
the message.
- * @param string $body The body of the
message.
- * @param int $thread_id The
thread_id of the message, if known.
- * @param int $is_followup_to The message_id
of the parent message, if any.
- * @param int $user_id The id of the
user that is posting the message
+ * @param string $subject The subject of the
message.
+ * @param string $body The body of the message.
+ * @param int $thread_id The thread_id of the
message, if known.
+ * @param int $is_followup_to The message_id of the
parent message, if any.
+ * @param int $user_id The id of the user that
is posting the message
* @return bool success.
*/
- function insertmoderated($subject, $body, $thread_id=0,
$is_followup_to=0,$user_id) {
+ function insertmoderated($subject, $body, $thread_id, $is_followup_to,
$user_id) {
if (!$thread_id) {
$thread_id=$this->Forum->getNextThreadID();
$is_followup_to=0;
@@ -151,15 +151,15 @@ class ForumMessage extends FFError {
/**
* insertreleasedmsg - inserts the released message into the main table
(forum)
*
- * @param string $group_forum_id The Forum id
+ * @param string $group_forum_id The Forum id
* @param string $subject The subject of the
message.
* @param string $body The body of the message.
* @param string $post_date The post date
- * @param int $thread_id The thread_id
of the message
- * @param int $is_followup_to The message_id of the
parent message, if any.
- * @param int $posted_by The id of the
user that is posting the message
- * @param int $has_followups has followups?
- * @param int $most_recent_date most recent date
+ * @param int $thread_id The thread_id of the
message
+ * @param int $is_followup_to The message_id of the
parent message, if any.
+ * @param int $posted_by The id of the user that
is posting the message
+ * @param int $has_followups has followups?
+ * @param int $most_recent_date most recent date
* @return bool success.
*/
function insertreleasedmsg($group_forum_id, $subject, $body,
$post_date, $thread_id,
@@ -240,17 +240,16 @@ class ForumMessage extends FFError {
/**
* insertmsg - inserts the message into the main table (forum)
*
- * @param string $subject The subject of
the message.
- * @param string $body The body of the
message.
- * @param int $thread_id The
thread_id of the message, if known.
- * @param int $is_followup_to The message_id
of the parent message, if any.
- * @param int $user_id The id
of the user that is posting the message
- * @param bool $has_attach Whether the
message has an attach associated. Defaults to false
- * @param int $timestamp The
timestamp of the message to insert, defaults to 0.
+ * @param string $subject The subject of the message.
+ * @param string $body The body of the message.
+ * @param int $thread_id The thread_id of the message,
if known.
+ * @param int $is_followup_to The message_id of the parent
message, if any.
+ * @param int $user_id The id of the user that is
posting the message
+ * @param bool $has_attach Whether the message has an
attach associated. Defaults to false
+ * @param int $timestamp The timestamp of the message to
insert, defaults to 0.
* @return bool success.
*/
- function insertmsg($subject, $body, $thread_id=0, $is_followup_to=0,
- $user_id, $has_attach=false,
$timestamp=0) {
+ function insertmsg($subject, $body, $thread_id, $is_followup_to,
$user_id, $has_attach = false, $timestamp = 0) {
if ($timestamp == 0){
$timestamp = time();
}
@@ -345,12 +344,12 @@ class ForumMessage extends FFError {
/**
* create - use this function to create a new message in the database.
*
- * @param string $subject The subject of the
message.
- * @param string $body The body of the message.
- * @param int $thread_id The thread_id
of the message, if known.
- * @param int $is_followup_to The message_id of the
parent message, if any.
- * @param bool $has_attach Whether the message has
an attach associated. Defaults to false
- * @param int $timestamp The timestamp
of the message to create. Defaults to 0, meaning the timestamp used for this
message will be "time()"
+ * @param string $subject The subject of the message.
+ * @param string $body The body of the message.
+ * @param int $thread_id The thread_id of the message,
if known.
+ * @param int $is_followup_to The message_id of the parent
message, if any.
+ * @param bool $has_attach Whether the message has an
attach associated. Defaults to false
+ * @param int $timestamp The timestamp of the message to
create. Defaults to 0, meaning the timestamp used for this message will be
"time()"
* @return bool success.
*/
function create($subject, $body, $thread_id=0, $is_followup_to=0,
$has_attach=false, $timestamp = 0) {
@@ -397,7 +396,7 @@ class ForumMessage extends FFError {
/**
* fetchData - re-fetch the data for this forum_message from the
database.
*
- * @param int $msg_id The message ID.
+ * @param int $msg_id The message ID.
* @return bool success.
*/
function fetchData($msg_id) {
@@ -415,7 +414,7 @@ class ForumMessage extends FFError {
/**
* fetchModeratedData - re-fetch the data for this forum_message from
the database, for pending messages
*
- * @param int The message ID.
+ * @param int The message ID.
* @return bool success.
*/
function fetchModeratedData($msg_id) {
diff --git a/src/common/tracker/include/ArtifactTypeHtml.class.php
b/src/common/tracker/include/ArtifactTypeHtml.class.php
index c94ce5b..8c1fec5 100644
--- a/src/common/tracker/include/ArtifactTypeHtml.class.php
+++ b/src/common/tracker/include/ArtifactTypeHtml.class.php
@@ -6,7 +6,7 @@
* Copyright 2010 (c) Fusionforge Team
* Copyright 2011, Franck Villaume - Capgemini
* Copyright (C) 2011 Alain Peyrat - Alcatel-Lucent
- * Copyright 2014,2016-2017, Franck Villaume - TrivialDev
+ * Copyright 2014,2016-2017,2021, Franck Villaume - TrivialDev
* Copyright 2016-2017, Stéphane-Eymeric Bredthauer - TrivialDev
* http://fusionforge.org
*
@@ -573,7 +573,7 @@ class ArtifactTypeHtml extends ArtifactType {
* @param string $mode Display mode (QUERY OR DISPLAY OR NEW)
* @return string HTML template.
*/
- function generateRenderHTML($types=array(), $mode) {
+ function generateRenderHTML($types, $mode) {
if ($mode == 'NEW') {
$efarr = $this->getExtraFields($types, false, false);
} else {
diff --git a/src/plugins/scmgit/common/GitPlugin.class.php
b/src/plugins/scmgit/common/GitPlugin.class.php
index cf3e152..121d0cc 100644
--- a/src/plugins/scmgit/common/GitPlugin.class.php
+++ b/src/plugins/scmgit/common/GitPlugin.class.php
@@ -5,7 +5,7 @@
* Copyright 2009, Roland Mas
* Copyright 2009, Mehdi Dogguy <[email protected]>
* Copyright 2013, Thorsten Glaser <[email protected]>
- * Copyright 2012-2014,2016-2018, Franck Villaume - TrivialDev
+ * Copyright 2012-2014,2016-2018,2021, Franck Villaume - TrivialDev
* http://fusionforge.org
*
* This file is part of FusionForge.
@@ -1234,7 +1234,7 @@ control over it to the project's administrator.");
}
}
- function getCommits($project, $user = null, $nb_commits) {
+ function getCommits($project, $user, $nb_commits) {
$commits = array();
if ($project->usesPlugin($this->name) &&
forge_check_perm('scm', $project->getID(), 'read')) {
// Grab&parse commit log
diff --git a/src/plugins/scmsvn/common/SVNPlugin.class.php
b/src/plugins/scmsvn/common/SVNPlugin.class.php
index 8b3a058..923bbcc 100644
--- a/src/plugins/scmsvn/common/SVNPlugin.class.php
+++ b/src/plugins/scmsvn/common/SVNPlugin.class.php
@@ -808,7 +808,7 @@ some control over it to the project's administrator.");
}
// Get latest commits for inclusion in a widget
- function getCommits($project, $user = null, $nbCommits) {
+ function getCommits($project, $user, $nbCommits) {
global $commits, $users, $adds, $updates, $messages, $times,
$revisions, $deletes, $time_ok, $user_list, $last_message, $notimecheck,
$xml_parser;
$commits = 0;
$users = array();
-----------------------------------------------------------------------
Summary of changes:
src/common/forum/ForumMessage.class.php | 59 +++++++++++-----------
.../tracker/include/ArtifactTypeHtml.class.php | 4 +-
src/plugins/scmgit/common/GitPlugin.class.php | 4 +-
src/plugins/scmsvn/common/SVNPlugin.class.php | 2 +-
4 files changed, 34 insertions(+), 35 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
