[Fusionforge-commits] FusionForge branch master updated. 350d21c Merge branch '6.0'

Franck Villaume nerville at libremir.placard.fr.eu.org
Sun Jun 7 16:59:45 CEST 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  350d21cc4581b125fae4818988f0834aa155de18 (commit)
       via  4def49ee10e65a0195f39e33376f1b0440c7282b (commit)
      from  a13cabff6ce2913f3d3154920a87f493196b6535 (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 350d21cc4581b125fae4818988f0834aa155de18
Merge: a13cabf 4def49e
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Sun Jun 7 16:59:38 2015 +0200

    Merge branch '6.0'


Summary of changes:
 src/common/docman/Document.class.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/common/docman/Document.class.php b/src/common/docman/Document.class.php
index 9aad002..a7c5ffc 100644
--- a/src/common/docman/Document.class.php
+++ b/src/common/docman/Document.class.php
@@ -818,6 +818,12 @@ class Document extends Error {
 			return false;
+		$dg = new DocumentGroup($this->getGroup(), $doc_group);
+		if ($dg->hasDocument($filename)) {
+			$this->setError(_('Document already published in this folder').' '.$dg->getPath());
+			return false;
+		}
 		$colArr = array('title', 'description', 'stateid', 'doc_group', 'filetype', 'filename', 'updatedate', 'locked', 'locked_by');
 		$valArr = array(htmlspecialchars($title), htmlspecialchars($description), $stateid, $doc_group, $filetype, $filename, time(), 0, NULL);


More information about the Fusionforge-commits mailing list