[Fusionforge-commits] FusionForge branch master updated. v6.0.3-224-g9e5ea81

Franck Villaume nerville at libremir.placard.fr.eu.org
Sat Nov 14 19:38:03 CET 2015


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  9e5ea81299a72d58fe558af2599a085d251ff302 (commit)
      from  fd51a4c8bb8e8d6699c98ea7d4ae124fb69734dc (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=9e5ea81299a72d58fe558af2599a085d251ff302

commit 9e5ea81299a72d58fe558af2599a085d251ff302
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Sat Nov 14 19:36:33 2015 +0100

    docman: remove useless code

diff --git a/src/common/docman/Document.class.php b/src/common/docman/Document.class.php
index 9e8e68d..67540bd 100644
--- a/src/common/docman/Document.class.php
+++ b/src/common/docman/Document.class.php
@@ -1022,8 +1022,8 @@ class Document extends Error {
 			$this->setOnUpdateError(_('wrong parameters'));
 			return false;
 		}
-		$qpa = db_construct_qpa();
-		$qpa = db_construct_qpa($qpa, 'UPDATE doc_data SET ');
+
+		$qpa = db_construct_qpa(false, 'UPDATE doc_data SET ');
 		for ($i = 0; $i < count($colArr); $i++) {
 			switch ($colArr[$i]) {
 				case 'filesize':
diff --git a/src/common/docman/DocumentGroup.class.php b/src/common/docman/DocumentGroup.class.php
index ddc0b41..55cd1af 100644
--- a/src/common/docman/DocumentGroup.class.php
+++ b/src/common/docman/DocumentGroup.class.php
@@ -969,8 +969,8 @@ class DocumentGroup extends Error {
 			$this->setOnUpdateError(_('wrong parameters'));
 			return false;
 		}
-		$qpa = db_construct_qpa();
-		$qpa = db_construct_qpa($qpa, 'UPDATE doc_groups SET ');
+
+		$qpa = db_construct_qpa(false, 'UPDATE doc_groups SET ');
 		for ($i = 0; $i < count($colArr); $i++) {
 			switch ($colArr[$i]) {
 				case 'groupname':
diff --git a/src/common/docman/DocumentManager.class.php b/src/common/docman/DocumentManager.class.php
index afe2a47..8154105 100644
--- a/src/common/docman/DocumentManager.class.php
+++ b/src/common/docman/DocumentManager.class.php
@@ -359,13 +359,12 @@ class DocumentManager extends Error {
 	 * @return	array	number per section of activities found between begin and end values
 	 */
 	function getActivity($sections, $begin, $end) {
-		$qpa = db_construct_qpa();
 		for ($i = 0; $i < count($sections); $i++) {
 			$union = 0;
 			if (count($sections) >= 1 && $i != count($sections) -1) {
 				$union = 1;
 			}
-			$qpa = db_construct_qpa($qpa, 'SELECT count(*) FROM activity_vw WHERE activity_date BETWEEN $1 AND $2
+			$qpa = db_construct_qpa(false, 'SELECT count(*) FROM activity_vw WHERE activity_date BETWEEN $1 AND $2
 							AND group_id = $3 AND section = $4 ',
 							array($begin,
 								$end,

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

Summary of changes:
 src/common/docman/Document.class.php        | 4 ++--
 src/common/docman/DocumentGroup.class.php   | 4 ++--
 src/common/docman/DocumentManager.class.php | 3 +--
 3 files changed, 5 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list