[Fusionforge-commits] FusionForge branch master updated. 789eb563b33da596eb3d051d782c9fe63d67919c

Alain Peyrat aljeux at fusionforge.org
Mon Nov 26 20:38:39 CET 2012


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  789eb563b33da596eb3d051d782c9fe63d67919c (commit)
      from  a130ba85c8630bfcbad02b99dbc272931ca7d20c (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 789eb563b33da596eb3d051d782c9fe63d67919c
Author: Alain Peyrat <aljeux at free.fr>
Date:   Mon Nov 26 20:38:26 2012 +0100

    docman: Fix upload issue with text plain files (and maybe html also)

diff --git a/src/common/docman/engine/parser_html.php b/src/common/docman/engine/parser_html.php
index f339a28..54024a0 100644
--- a/src/common/docman/engine/parser_html.php
+++ b/src/common/docman/engine/parser_html.php
@@ -50,11 +50,9 @@ fwrite($fd , $strip_content);
 fclose($fd);
 
 echo parser_text($filename);
-unlink ($fichin);
+unlink ($filename);
 
 // Local Variables:
 // mode: php
 // c-file-style: "bsd"
 // End:
-
-?>
diff --git a/src/common/docman/engine/parser_text.php b/src/common/docman/engine/parser_text.php
index 5b0c9c2..4948062 100644
--- a/src/common/docman/engine/parser_text.php
+++ b/src/common/docman/engine/parser_text.php
@@ -38,7 +38,6 @@ if (!is_file($fichin))
 	exit(1);
 
 echo parser_text($fichin);
-unlink($fichin);
 
 // Local Variables:
 // mode: php
diff --git a/src/common/include/Storage.class.php b/src/common/include/Storage.class.php
index 0bb2a79..e3a1e3f 100644
--- a/src/common/include/Storage.class.php
+++ b/src/common/include/Storage.class.php
@@ -60,7 +60,7 @@ class Storage extends Error {
 
 		$this->pending_store[] = $storage;
 
-		if (is_file($file) && is_dir($storage)) {
+		if (is_file($file) && is_dir($dir)) {
 			$ret = rename($file, $storage);
 			if (!$ret) {
 				$this->setError(sprintf(_('File %1$s cannot be moved to the permanent location: %2$s.'), $file, $storage));

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

Summary of changes:
 src/common/docman/engine/parser_html.php |    4 +---
 src/common/docman/engine/parser_text.php |    1 -
 src/common/include/Storage.class.php     |    2 +-
 3 files changed, 2 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list