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 fbbce1b7a4be4271d40b7abb13ebc78e6f6d9e11 (commit)
via dab80d821d00e2c0a79d02a2d3f0ebe8f594256f (commit)
from ac25c60d273d104baa4e9a371541b8e7712114ad (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=fbbce1b7a4be4271d40b7abb13ebc78e6f6d9e11
commit fbbce1b7a4be4271d40b7abb13ebc78e6f6d9e11
Author: Franck Villaume <[email protected]>
Date: Wed Jan 3 12:51:16 2018 +0000
fix php warning if createdate not set in json import file for docgroupImport
diff --git a/src/bin/forge b/src/bin/forge
index fab9fd6..6fc4e63 100755
--- a/src/bin/forge
+++ b/src/bin/forge
@@ -1319,6 +1319,9 @@ class CliActions {
}
} else {
$parent_doc_group =
(int)$this->getMappingId($stream['data_array']['parent_doc_group'],
'doc_group');
+ if
(!isset($stream['data_array']['createdate'])) {
+ $stream['data_array']['createdate'] =
time();
+ }
if
(!$dg->create($stream['data_array']['groupname'], $parent_doc_group,
$stream['data_array']['stateid'], $stream['data_array']['createdate'])) {
echo $dg->getErrorMessage()."\n";
db_rollback();
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=dab80d821d00e2c0a79d02a2d3f0ebe8f594256f
commit dab80d821d00e2c0a79d02a2d3f0ebe8f594256f
Author: Franck Villaume <[email protected]>
Date: Wed Jan 3 12:50:40 2018 +0000
space vs. tab
diff --git a/src/common/docman/DocumentGroup.class.php
b/src/common/docman/DocumentGroup.class.php
index eddfa6a..84d2e4a 100644
--- a/src/common/docman/DocumentGroup.class.php
+++ b/src/common/docman/DocumentGroup.class.php
@@ -143,7 +143,7 @@ class DocumentGroup extends FFError {
* 2 = deleted
* 5 = private
* @param int $createtimestamp Timestamp of the
directory creation
- * @param bool $forcecreate
+ * @param bool $forcecreate
* @return bool true on success / false on failure.
* @access public
*/
-----------------------------------------------------------------------
Summary of changes:
src/bin/forge | 3 +++
src/common/docman/DocumentGroup.class.php | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
