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 93f35afee86985f1624254bc9c81d49543e08dec (commit)
via 16e594c8dc2e49af78119a32b7ebebcf76425d2e (commit)
from f058df9fea129502853d02e4cd709c64324662e9 (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=93f35afee86985f1624254bc9c81d49543e08dec
commit 93f35afee86985f1624254bc9c81d49543e08dec
Author: Marc-Etienne Vargenau <[email protected]>
Date: Mon Feb 29 14:57:43 2016 +0100
Check error message
diff --git a/src/www/pm/postuploadcsv.php b/src/www/pm/postuploadcsv.php
index 0cdf95b..68cb18b 100644
--- a/src/www/pm/postuploadcsv.php
+++ b/src/www/pm/postuploadcsv.php
@@ -47,6 +47,7 @@ $input_file = getUploadedFile('userfile');
if (isset($input_file) && isset($input_file['tmp_name']) &&
is_uploaded_file($input_file['tmp_name'])) {
+ // Check file format
if (function_exists('finfo_open')) {
$finfo = finfo_open(FILEINFO_MIME_TYPE);
$uploaded_data_type = finfo_file($finfo,
$input_file['tmp_name']);
@@ -54,7 +55,6 @@ if (isset($input_file) && isset($input_file['tmp_name']) &&
$uploaded_data_type = $input_file['type'];
}
-
if ($uploaded_data_type === "text/plain") {
$handle = fopen($input_file['tmp_name'], 'r');
@@ -131,5 +131,7 @@ if (isset($input_file) && isset($input_file['tmp_name']) &&
if (isset($res['success']) && $res['success']) {
$feedback .= _('Import was successful');
} else {
- $error_msg .= $res['errormessage'];
+ if (isset($res['errormessage'])) {
+ $error_msg .= $res['errormessage'];
+ }
}
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=16e594c8dc2e49af78119a32b7ebebcf76425d2e
commit 16e594c8dc2e49af78119a32b7ebebcf76425d2e
Author: Marc-Etienne Vargenau <[email protected]>
Date: Mon Feb 29 14:56:55 2016 +0100
Translate ': '
diff --git a/src/www/admin/responses_admin.php
b/src/www/admin/responses_admin.php
index 89e9f67..221670f 100644
--- a/src/www/admin/responses_admin.php
+++ b/src/www/admin/responses_admin.php
@@ -31,7 +31,7 @@ require_once $gfwww.'project/admin/project_admin_utils.php';
global $HTML;
-site_admin_header(array('title'=>_('Site Admin').(': ')._('Edit Rejection
Responses')));
+site_admin_header(array('title'=>_('Site Admin')._(': ')._('Edit Rejection
Responses')));
function check_select_value($value) {
if( $value == "100" ) {
-----------------------------------------------------------------------
Summary of changes:
src/www/admin/responses_admin.php | 2 +-
src/www/pm/postuploadcsv.php | 6 ++++--
2 files changed, 5 insertions(+), 3 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
