[Fusionforge-commits] FusionForge branch master updated. v6.0.5-1338-ged54e87

Franck Villaume nerville at libremir.placard.fr.eu.org
Sun Jan 15 18:53:40 CET 2017


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  ed54e87bb3def3a7f9f5f79f4bb58a61a126a8a4 (commit)
      from  9ab8d7f757cf7ab30d9eec72a70cfab5ac7070fd (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=ed54e87bb3def3a7f9f5f79f4bb58a61a126a8a4

commit ed54e87bb3def3a7f9f5f79f4bb58a61a126a8a4
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Sun Jan 15 18:51:54 2017 +0100

    docman: minor fixes on display fields and html content

diff --git a/src/common/docman/DocumentVersionFactory.class.php b/src/common/docman/DocumentVersionFactory.class.php
index df6591f..1c6bf4c 100644
--- a/src/common/docman/DocumentVersionFactory.class.php
+++ b/src/common/docman/DocumentVersionFactory.class.php
@@ -88,7 +88,7 @@ class DocumentVersionFactory extends FFError {
 				}
 				$new_description = util_gen_cross_ref($arr['description'], $this->Document->Group->getID());
 				$arr['new_description'] = nl2br($new_description);
-				$arr['versionactions'][] = util_make_link('#', $HTML->getEditFilePic(_('Edit this version'), 'editversion'), array('id' => 'version_action_edit', 'onclick' => 'javascript:controllerListFile.toggleEditVersionView({title: \''.addslashes($arr['title']).'\', description: '.json_encode($arr['description']).', new_description: '.json_encode($arr['new_description']).', version: '.ltrim($arr['version'], '_').', current_version: '.$arr['current_version'].', isURL: '.$isURL.', isText: '.$isText.', isHtml: '.$isHtml.', filename: \''.addslashes($arr['filename']).'\', vcomment: \''.addslashes($arr['vcomment']).'\', docid: '.$arr['docid'].', groupId: '.$this->Document->Group->getID().'})'), true);
+				$arr['versionactions'][] = util_make_link('#', $HTML->getEditFilePic(_('Edit this version'), 'editversion'), array('id' => 'version_action_edit', 'onclick' => 'javascript:controllerListFile.toggleEditVersionView({title: \''.addslashes($arr['title']).'\', description: \''.addslashes($arr['description']).'\', new_description: \''.addslashes($arr['new_description']).'\', version: '.ltrim($arr['version'], '_').', current_version: '.$arr['current_version'].', isURL: '.$isURL.', isText: '.$isText.', isHtml: '.$isHtml.', filename: \''.addslashes($arr['filename']).'\', vcomment: \''.addslashes($arr['vcomment']).'\', docid: '.$arr['docid'].', groupId: '.$this->Document->Group->getID().'})'), true);
 				if ($numrows > 1) {
 					$arr['versionactions'][] = util_make_link('#', $HTML->getRemovePic(_('Permanently delete this version'), 'delversion'), array('id' => 'version_action_delete', 'onclick' => 'javascript:controllerListFile.deleteVersion({version: '.ltrim($arr['version'], '_').', docid: '.$arr['docid'].', groupId: '.$this->Document->Group->getID().'})'), true);
 				}
diff --git a/src/common/docman/actions/editfile.php b/src/common/docman/actions/editfile.php
index 3a10d70..dc31db1 100644
--- a/src/common/docman/actions/editfile.php
+++ b/src/common/docman/actions/editfile.php
@@ -89,7 +89,6 @@ switch ($subaction) {
 		$version = getIntFromRequest('edit_version', 0);
 		$new_version = getIntFromRequest('new_version', 0);
 		$details = $sanitizer->SanitizeHtml($details);
-		$vcomment = $sanitizer->SanitizeHtml($vcomment);
 		$data = '';
 
 		if ($version) {
diff --git a/src/common/docman/views/editfile.php b/src/common/docman/views/editfile.php
index 16ca5bb..19c0712 100644
--- a/src/common/docman/views/editfile.php
+++ b/src/common/docman/views/editfile.php
@@ -113,7 +113,7 @@ $cells[][] = html_e('input', array('type' => 'checkbox', 'title' => _('Make this
 echo $HTML->multiTableRow(array(), $cells);
 $cells = array();
 $cells[][] = _('Type of Document') .utils_requiredField();
-$nextcell = html_e('input', array('type' => 'radio', 'id' => 'editButtonFile', 'name' => 'type', 'value' => 'httpupload', 'checked' => 'checked', 'required' => 'required')).html_e('label', array('for' => 'editButtonFile'), _('File')).
+$nextcell = html_e('input', array('type' => 'radio', 'id' => 'editButtonFile', 'name' => 'type', 'value' => 'httpupload', 'required' => 'required')).html_e('label', array('for' => 'editButtonFile'), _('File')).
 		html_e('input', array('type' => 'radio', 'id' => 'editButtonUrl', 'name' => 'type', 'value' => 'pasteurl', 'required' => 'required')).html_e('label', array('for' => 'editButtonUrl'), _('URL'));
 if (forge_get_config('use_manual_uploads')) {
 	$nextcell .= html_e('input', array('type' => 'radio', 'id' => 'editButtonManualUpload', 'name' => 'type', 'value' => 'manualupload', 'required' => 'required')).html_e('label', array('for' => 'editButtonManualUpload'), _('Already-uploaded file'));

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

Summary of changes:
 src/common/docman/DocumentVersionFactory.class.php | 2 +-
 src/common/docman/actions/editfile.php             | 1 -
 src/common/docman/views/editfile.php               | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list