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, 6.1 has been updated
       via  4c9bd01469bec607af881309b5ed66dc95b446f5 (commit)
      from  7562507b55c86677b3dc86015632ede8c2b9fcce (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=4c9bd01469bec607af881309b5ed66dc95b446f5

commit 4c9bd01469bec607af881309b5ed66dc95b446f5
Author: Franck Villaume <franck.villa...@trivialdev.com>
Date:   Fri Feb 2 23:57:24 2018 +0000

    frs: fix use manual upload support. do not overwrite global var

diff --git a/src/common/frs/views/usemanualuploads.php 
b/src/common/frs/views/usemanualuploads.php
index 3ea6536..981908d 100644
--- a/src/common/frs/views/usemanualuploads.php
+++ b/src/common/frs/views/usemanualuploads.php
@@ -32,7 +32,7 @@ $localcontent = sprintf(_('Alternatively, you can use a file 
you already uploade
                        $incoming, 
'sftp://'.forge_get_config('web_host').$incoming.'/');
 $localcontent .= ' ' . _('This direct <samp>sftp://</samp> link only works 
with some browsers, such as Konqueror.') .html_e('br');
 $localcontent .= _('Choose an already uploaded file')._(':');
-$content = html_e('p', array(), $localcontent);
+$content .= html_e('p', array(), $localcontent);
 $manual_files_arr = frs_filterfiles(ls($incoming, true));
 if (count($manual_files_arr)) {
        $content .= html_build_select_box_from_arrays($manual_files_arr, 
$manual_files_arr, 'manual_filename', '');

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

Summary of changes:
 src/common/frs/views/usemanualuploads.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
FusionForge

_______________________________________________
Fusionforge-commits mailing list
Fusionforge-commits@lists.fusionforge.org
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits

Reply via email to