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 a80cbbcdcc319d5d730902a3d7c1d16e22da94a5 (commit)
from 36fe4180180fbcddffcc127b7e517b7cc5fa4476 (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=a80cbbcdcc319d5d730902a3d7c1d16e22da94a5
commit a80cbbcdcc319d5d730902a3d7c1d16e22da94a5
Author: Franck Villaume <franck.villa...@trivialdev.com>
Date: Sat May 1 23:57:17 2021 +0200
fix PHP warning. Add missing global
diff --git a/src/common/pm/ProjectTask.class.php
b/src/common/pm/ProjectTask.class.php
index 367d2df..b014e7a 100644
--- a/src/common/pm/ProjectTask.class.php
+++ b/src/common/pm/ProjectTask.class.php
@@ -28,7 +28,7 @@
require_once $gfcommon.'include/FFError.class.php';
require_once $gfcommon.'include/Validator.class.php';
-function projecttask_get_object($project_task_id,$data=false) {
+function projecttask_get_object($project_task_id, $data = false) {
global $PROJECTTASK_OBJ;
if (!isset($PROJECTTASK_OBJ["_".$project_task_id."_"])) {
if ($data) {
@@ -250,7 +250,10 @@ class ProjectTask extends FFError {
* @return int The project_task_id.
*/
function getID() {
- return $this->data_array['project_task_id'];
+ if (isset($this->data_array['project_task_id'])) {
+ return $this->data_array['project_task_id'];
+ }
+ return 0;
}
/**
@@ -583,19 +586,19 @@ class ProjectTask extends FFError {
// May not yet have an ID, if we are creating a NEW task
//
if ($this->getID()) {
- return db_query_params ('SELECT project_task_id,summary
- FROM project_task
- WHERE group_project_id=$1
- AND project_task_id <> $2
- ORDER BY project_task_id DESC',
+ return db_query_params('SELECT project_task_id,summary
+ FROM project_task
+ WHERE group_project_id=$1
+ AND project_task_id <> $2
+ ORDER BY project_task_id DESC',
array
($this->ProjectGroup->getID(),
- $this->getID())) ;
+ $this->getID()));
} else {
- return db_query_params ('SELECT project_task_id,summary
- FROM project_task
- WHERE group_project_id=$1
- ORDER BY project_task_id DESC',
- array
($this->ProjectGroup->getID())) ;
+ return db_query_params('SELECT project_task_id,summary
+ FROM project_task
+ WHERE group_project_id=$1
+ ORDER BY project_task_id DESC',
+ array
($this->ProjectGroup->getID()));
}
}
diff --git a/src/www/pm/add_task.php b/src/www/pm/add_task.php
index 5e5bbe7..1486619 100644
--- a/src/www/pm/add_task.php
+++ b/src/www/pm/add_task.php
@@ -25,7 +25,7 @@
require_once $gfwww.'include/note.php';
-global $HTML;
+global $HTML, $pg, $pt;
$related_artifact_id = getIntFromRequest('related_artifact_id');
$related_artifact_summary = getStringFromRequest('related_artifact_summary');
diff --git a/src/www/pm/include/ProjectTaskHTML.class.php
b/src/www/pm/include/ProjectTaskHTML.class.php
index 00b6e4c..7958137 100644
--- a/src/www/pm/include/ProjectTaskHTML.class.php
+++ b/src/www/pm/include/ProjectTaskHTML.class.php
@@ -33,11 +33,11 @@ class ProjectTaskHTML extends ProjectTask {
parent::__construct($ProjectGroup, $project_task_id, $arr);
}
- function multipleDependBox ($name='dependent_on[]') {
- $result=$this->getOtherTasks();
+ function multipleDependBox($name = 'dependent_on[]') {
+ $result = $this->getOtherTasks();
//get the data so we can mark items as SELECTED
$arr2 = array_keys($this->getDependentOn());
- return html_build_multiple_select_box
($result,$name,$arr2,8,false);
+ return html_build_multiple_select_box($result, $name, $arr2, 8,
false);
}
function multipleAssignedBox ($name='assigned_to[]') {
diff --git a/src/www/pm/task.php b/src/www/pm/task.php
index e890c59..3c88f62 100644
--- a/src/www/pm/task.php
+++ b/src/www/pm/task.php
@@ -81,7 +81,7 @@ if (!$group || !is_object($group)) {
exit_error($group->getErrorMessage(),'pm');
}
-$pg = new ProjectGroupHTML($group,$group_project_id);
+$pg = new ProjectGroupHTML($group, $group_project_id);
if (!$pg || !is_object($pg)) {
exit_error(_('Could Not Get Factory'),'pm');
} elseif ($pg->isError()) {
@@ -99,7 +99,7 @@ switch (getStringFromRequest('func')) {
case 'addtask' : {
session_require_perm ('pm', $pg->getID(), 'manager') ;
- $pt=new ProjectTaskHTML($pg);
+ $pt = new ProjectTaskHTML($pg);
if (!$pt || !is_object($pt)) {
exit_error(_('Could Not Get ProjectTask'),'pm');
} elseif ($pt->isError()) {
-----------------------------------------------------------------------
Summary of changes:
src/common/pm/ProjectTask.class.php | 29 +++++++++++++++-------------
src/www/pm/add_task.php | 2 +-
src/www/pm/include/ProjectTaskHTML.class.php | 6 +++---
src/www/pm/task.php | 4 ++--
4 files changed, 22 insertions(+), 19 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
Fusionforge-commits@lists.fusionforge.org
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
