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 cb6487ffd933bc764883fd2b16cdb4eb150770de (commit)
from 2f182b35e436dfa458ffd796291c92e29cabf56c (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=cb6487ffd933bc764883fd2b16cdb4eb150770de
commit cb6487ffd933bc764883fd2b16cdb4eb150770de
Author: Franck Villaume <[email protected]>
Date: Mon Dec 23 13:58:20 2019 +0100
fix PHP warning
diff --git a/src/common/valid/ValidFactory.class.php
b/src/common/valid/ValidFactory.class.php
index e353f2a..7a9f4ba 100644
--- a/src/common/valid/ValidFactory.class.php
+++ b/src/common/valid/ValidFactory.class.php
@@ -95,7 +95,8 @@ class Valid_String extends Valid_Text {
class Valid_WhiteList extends Valid {
function __construct($key, $whitelist) {
parent::__construct($key);
- $this->addRule(new Rule_WhiteList($whitelist));
+ $rwl = new Rule_WhiteList($whitelist);
+ $this->addRule($rwl);
}
}
diff --git a/src/common/widget/Widget_MyArtifacts.class.php
b/src/common/widget/Widget_MyArtifacts.class.php
index dc6284e..0c73f0d 100644
--- a/src/common/widget/Widget_MyArtifacts.class.php
+++ b/src/common/widget/Widget_MyArtifacts.class.php
@@ -1,7 +1,7 @@
<?php
/**
* Copyright (c) Xerox Corporation, Codendi Team, 2001-2009. All rights
reserved
- * Copyright 2012-2013,2018, Franck Villaume - TrivialDev
+ * Copyright 2012-2013,2018-2019, Franck Villaume - TrivialDev
* Copyright 2013, French Ministry of Education
* http://fusionforge.org
*
@@ -110,7 +110,8 @@ class Widget_MyArtifacts extends Widget {
function getContent() {
global $HTML;
- $atf = new
ArtifactsForUser(@UserManager::instance()->getCurrentUser());
+ $user = @UserManager::instance()->getCurrentUser();
+ $atf = new ArtifactsForUser($user);
$my_artifacts = array();
if ($this->_artifact_show == 'ASM') {
$my_artifacts =
$atf->getArtifactsFromSQLwithParams('SELECT * FROM artifact_vw av where
(av.submitted_by=$1 OR av.assigned_to=$1 OR av.artifact_id IN (select
artifact_monitor.artifact_id FROM artifact_monitor WHERE
artifact_monitor.user_id = $1)) AND av.status_id=1 ORDER BY
av.group_artifact_id, av.artifact_id
DESC',array(UserManager::instance()->getCurrentUser()->getID()));
-----------------------------------------------------------------------
Summary of changes:
src/common/valid/ValidFactory.class.php | 3 ++-
src/common/widget/Widget_MyArtifacts.class.php | 5 +++--
2 files changed, 5 insertions(+), 3 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
