[Fusionforge-commits] FusionForge branch master updated. 780e0095884da122cbe938ddf48f4355caeeceae

Franck VILLAUME nerville at fusionforge.org
Sat Feb 22 14:37:39 CET 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  780e0095884da122cbe938ddf48f4355caeeceae (commit)
      from  710c948bf98d01211a40460fe7e64fef7c404f81 (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 780e0095884da122cbe938ddf48f4355caeeceae
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Sat Feb 22 14:37:14 2014 +0100

    docman: fix merge

diff --git a/src/common/docman/views/addfile.php b/src/common/docman/views/addfile.php
index 1b12835..86ed460 100644
--- a/src/common/docman/views/addfile.php
+++ b/src/common/docman/views/addfile.php
@@ -122,7 +122,6 @@ if ($dgf->getNested() == NULL) {
 	if ($g->useCreateOnline()) {
 		echo html_e('input', array('type' => 'radio', 'id' => 'buttonEditor', 'name' => 'type', 'value' => 'editor', 'required' => 'required')).html_e('span', array(), _('Create online'), false);
 	}
-<<<<<<< HEAD
 	echo html_ac(html_ap() - 2);
 	echo html_ao('tr', array('id' => 'filerow'));
 	echo html_e('td', array(), _('Upload File').utils_requiredField(), false);
@@ -149,9 +148,8 @@ if ($dgf->getNested() == NULL) {
 		} else {
 			echo html_e('p', array('class' => 'warning'), printf(_('You need first to upload file in %s'),$incoming), false);
 		}
-		echo html_ac(html_ap() - 1);
+		echo html_ac(html_ap() - 2);
 	}
-	echo html_ac(html_ap() - 1);
 	echo html_ao('tr', array('id' => 'editnamerow', 'style' => 'display:none'));
 	echo html_e('td', array(), _('File Name').utils_requiredField(), false);
 	echo html_ao('td');

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

Summary of changes:
 src/common/docman/views/addfile.php |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list