[Fusionforge-commits] FusionForge branch Branch_5_3 updated. 74996d7d6f2948475ed170f764e28585a9aeddb0

[Franck Villaume]

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, Branch_5_3 has been updated
       via  74996d7d6f2948475ed170f764e28585a9aeddb0 (commit)
      from  c6435c05f85bf73fb7ad15db920f23d73db620b4 (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 74996d7d6f2948475ed170f764e28585a9aeddb0
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Tue Apr 15 18:26:49 2014 +0200

    frs: fix error handling, avoid open transaction detected message

diff --git a/src/common/frs/include/frs_utils.php b/src/common/frs/include/frs_utils.php
index 8b01ae3..1611501 100644
--- a/src/common/frs/include/frs_utils.php
+++ b/src/common/frs/include/frs_utils.php
@@ -247,7 +247,7 @@ function frs_add_file_from_form ($release, $type_id, $processor_id, $release_dat
 
 	if ($filechecks) {
 		if (strlen($fname) < 3)
-			exit_error('Error',_('Name is too short. It must be at least 3 characters.'));
+			return _('Name is too short. It must be at least 3 characters.');
 		if (!$move) {
 			$tmp = tempnam ('', '') ;
 			copy ($infile, $tmp) ;
@@ -255,12 +255,12 @@ function frs_add_file_from_form ($release, $type_id, $processor_id, $release_dat
 		}
 		$frsf = new FRSFile($release);
 		if (!$frsf || !is_object($frsf)) {
-			exit_error(_('Could Not Get FRSFile'),'frs');
+			return _('Could Not Get FRSFile');
 		} elseif ($frsf->isError()) {
-			exit_error($frsf->getErrorMessage(),'frs');
+			return $frsf->getErrorMessage();
 		} else {
 			if (!$frsf->create($fname,$infile,$type_id,$processor_id,$release_date)) {
-				exit_error($frsf->getErrorMessage(),'frs');
+				return $frsf->getErrorMessage();
 			}
 			return true ;
 		}
diff --git a/src/www/frs/admin/qrs.php b/src/www/frs/admin/qrs.php
index 4ffa58e..ccce21d 100644
--- a/src/www/frs/admin/qrs.php
+++ b/src/www/frs/admin/qrs.php
@@ -105,7 +105,8 @@ if (getStringFromRequest('submit')) {
 
 				$ret = frs_add_file_from_form ($frsr, $type_id, $processor_id, $release_date,
 							       $userfile, $ftp_filename, $manual_filename) ;
-				if ($ret != true) {
+
+				if ($ret !== true) {
 					db_rollback() ;
 					exit_error ($ret,'frs') ;
 				}

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

Summary of changes:
 src/common/frs/include/frs_utils.php |    8 ++++----
 src/www/frs/admin/qrs.php            |    3 ++-
 2 files changed, 6 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
FusionForge