[evolvis-commits] r18497: small-fixes pending merges:↵ Thorsten Glaser 2012-07-12 fix manual (SFTP) upload in docman

mirabilos at evolvis.org mirabilos at evolvis.org
Thu Jul 12 16:28:28 CEST 2012


Author: mirabilos
Date: 2012-07-12 16:28:27 +0200 (Thu, 12 Jul 2012)
New Revision: 18497

Modified:
   trunk/gforge_base/evolvisforge-5.1/src/common/docman/actions/addfile.php
   trunk/gforge_base/evolvisforge-5.1/src/debian/changelog
Log:
small-fixes pending merges:
  Thorsten Glaser 2012-07-12 fix manual (SFTP) upload in docman

Modified: trunk/gforge_base/evolvisforge-5.1/src/common/docman/actions/addfile.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/common/docman/actions/addfile.php	2012-07-12 14:28:22 UTC (rev 18496)
+++ trunk/gforge_base/evolvisforge-5.1/src/common/docman/actions/addfile.php	2012-07-12 14:28:27 UTC (rev 18497)
@@ -52,7 +52,8 @@
 	session_redirect('/docman/?group_id='.$group_id.'&error_msg='.urlencode($return_msg));
 }
 	
-if (!$title || !$description || (!$uploaded_data && !$file_url && (!$editor && !$name))) {
+if (!$title || !$description || (!$uploaded_data && !$file_url &&
+    !$manual_path && (!$editor && !$name))) {
 	$missing_params = array();
 	if (!$title)
 		$missing_params[] = 'title';

Modified: trunk/gforge_base/evolvisforge-5.1/src/debian/changelog
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/debian/changelog	2012-07-12 14:28:22 UTC (rev 18496)
+++ trunk/gforge_base/evolvisforge-5.1/src/debian/changelog	2012-07-12 14:28:27 UTC (rev 18497)
@@ -9,8 +9,9 @@
   * Drop libjs-yui (unused except in phpwiki plugin and gforge theme)
   * Add the maven user to only active nōn-template groups
   * Tracker: sort the assignee drop-down field by unixname
+  * Docman: fix SFTP upload
 
- -- Thorsten Glaser <t.glaser at tarent.de>  Thu, 12 Jul 2012 15:13:27 +0200
+ -- Thorsten Glaser <t.glaser at tarent.de>  Thu, 12 Jul 2012 16:27:56 +0200
 
 fusionforge (1:5.1.1+evolvis64) unstable; urgency=low
 



More information about the evolvis-commits mailing list