[Fusionforge-commits] FusionForge branch master updated. d4f46e4d415df1c58867f32f038f83e757ff2a49

Thorsten Glaser mirabilos at fusionforge.org
Wed Jul 16 20:29:52 CEST 2014


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  d4f46e4d415df1c58867f32f038f83e757ff2a49 (commit)
       via  2ed08039354d7c52526948282d76485fe338f719 (commit)
       via  9c46c08b7ac74ae509ee9db3dc9ed8846f1c3975 (commit)
       via  2fafea55a94d06b5a849c5827949b1d97b3d399e (commit)
      from  6e43c9a26ed4e88486924f518fc5705b69a546ca (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 -----------------------------------------------------------------
commit d4f46e4d415df1c58867f32f038f83e757ff2a49
Merge: 6e43c9a 2ed0803
Author: Thorsten Glaser <t.glaser at tarent.de>
Date:   Wed Jul 16 20:29:47 2014 +0200

    Merge branch 'Branch_5_3'

diff --cc src/common/tracker/Artifact.class.php
index 944df49,3633712..820eeeb
--- a/src/common/tracker/Artifact.class.php
+++ b/src/common/tracker/Artifact.class.php
@@@ -857,21 -858,21 +857,21 @@@ class Artifact extends Error 
  	/**
  	 * setStatus - set the status of this artifact.
  	 *
 -	 * @param	int	The artifact status ID.
 -	 * @param	int	Closing date if status = 1
 +	 * @param	int	$status_id The artifact status ID.
 +	 * @param	int|bool	$closingTime Closing date if status = 1
  	 *
 -	 * @return	boolean	success.
 +	 * @return	bool	success.
  	 */
 -	function setStatus($status_id, $closingTime=False) {
 +	function setStatus($status_id, $closingTime=false) {
  		db_begin();
 -		$qpa = db_construct_qpa (false, 'UPDATE artifact SET status_id=$1', array ($status_id)) ;
 +		$qpa = db_construct_qpa(array(), 'UPDATE artifact SET status_id=$1', array ($status_id)) ;
  		if ($closingTime && $status_id != 1) {
  			$time=$closingTime;
 -			$qpa = db_construct_qpa ($qpa, ', close_date=$1 ', array ($time)) ;
 +			$qpa = db_construct_qpa($qpa, ', close_date=$1 ', array ($time)) ;
  		}
 -		$qpa = db_construct_qpa ($qpa,
 +		$qpa = db_construct_qpa($qpa,
  					 'WHERE artifact_id=$1 AND group_artifact_id=$2',
- 					 array ($this->getID(), $artifact_type_id)) ;
+ 					 array ($this->getID(), $this->ArtifactType->getID())) ;
  		$result=db_query_qpa($qpa);
  
  		if (!$result || db_affected_rows($result) < 1) {

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

Summary of changes:
 src/common/tracker/Artifact.class.php |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list