[Fusionforge-commits] FusionForge branch master updated. v6.0.5-2100-g553eced

Franck Villaume nerville at libremir.placard.fr.eu.org
Sun Aug 13 12:52:05 CEST 2017


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  553ecedd0c82277e435e759ef07b2aca639e4722 (commit)
      from  fa1f2b33b9b765d84bb0245c8d5c13cb02a38cc4 (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=553ecedd0c82277e435e759ef07b2aca639e4722

commit 553ecedd0c82277e435e759ef07b2aca639e4722
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Sun Aug 13 12:51:46 2017 +0200

    ftp integration: fix missing install-ftp call

diff --git a/src/GNUmakefile b/src/GNUmakefile
index 050ed1a..148dfc4 100644
--- a/src/GNUmakefile
+++ b/src/GNUmakefile
@@ -147,7 +147,7 @@ install-ftp: install-base-dirs
 	$(CP_R) cronjobs/ftp $(DESTDIR)$(pkgdatadir)/cronjobs/
 	$(CP_R) post-install.d/ftp $(DESTDIR)$(pkgdatadir)/post-install.d/
 
-install-base: install-base-dirs install-common install-web install-db install-scm
+install-base: install-base-dirs install-common install-web install-db install-scm install-ftp
 
 # Select only "valid" plugins for 'make install'
 PLUGINS=$(shell grep -l '^plugin_status\s=\svalid' plugins/*/etc/*.ini | sed 's,plugins/\([^/]*\)/.*,\1,')
diff --git a/src/common/include/System.class.php b/src/common/include/System.class.php
index 56c7f79..6468529 100644
--- a/src/common/include/System.class.php
+++ b/src/common/include/System.class.php
@@ -72,7 +72,7 @@ class System extends FFError {
 		} else {
 			$systasksq = new SysTasksQ();
 			$systasksq->add(SYSTASK_CORE, 'HOMEDIR', null, $user_id);
-			//$systasksq->add(SYSTASK_CORE, 'FTP_ACCESS', null, $user_id);
+			$systasksq->add(SYSTASK_CORE, 'FTP_ACCESS', null, $user_id);
 			return true;
 		}
 	}

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

Summary of changes:
 src/GNUmakefile                     | 2 +-
 src/common/include/System.class.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list