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.0 has been updated
via 031d83f56719c10e643fe7c275043ed6eed9afc3 (commit)
from dc4d35861f6db50f5649dcffc9a71b6d4c3a94c6 (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 031d83f56719c10e643fe7c275043ed6eed9afc3
Author: Franck Villaume <[email protected]>
Date: Sat May 23 11:41:04 2015 +0200
widgets Latest commits: fix use allow_multiple_scm option
diff --git a/src/common/widget/Widget_MyLatestCommits.class.php
b/src/common/widget/Widget_MyLatestCommits.class.php
index fe3b4d9..2150829 100644
--- a/src/common/widget/Widget_MyLatestCommits.class.php
+++ b/src/common/widget/Widget_MyLatestCommits.class.php
@@ -77,11 +77,11 @@ class Widget_MyLatestCommits extends Widget {
$revisions = array();
if ($project->usesPlugin('scmsvn') &&
forge_check_perm('scm', $project->getID(), 'read')) {
$scmPlugin = plugin_get_object('scmsvn');
- $revisions = $scmPlugin->getCommits($project,
$user, $this->_nb_commits);
+ $revisions = array_merge($revisions,
$scmPlugin->getCommits($project, $user, $this->_nb_commits));
}
if ($project->usesPlugin('scmgit') &&
forge_check_perm('scm', $project->getID(), 'read')) {
$scmPlugin = plugin_get_object('scmgit');
- $revisions = $scmPlugin->getCommits($project,
$user, $this->_nb_commits);
+ $revisions = array_merge($revisions,
$scmPlugin->getCommits($project, $user, $this->_nb_commits));
}
if (count($revisions) > 0) {
$global_nb_revisions += count($revisions);
diff --git a/src/common/widget/Widget_ProjectLatestCommits.class.php
b/src/common/widget/Widget_ProjectLatestCommits.class.php
index 30f8562..7a0d681 100644
--- a/src/common/widget/Widget_ProjectLatestCommits.class.php
+++ b/src/common/widget/Widget_ProjectLatestCommits.class.php
@@ -56,11 +56,11 @@ class Widget_ProjectLatestCommits extends Widget {
$revisions = array();
if ($project->usesPlugin('scmsvn') && forge_check_perm('scm',
$project->getID(), 'read')) {
$scmPlugin = plugin_get_object('scmsvn');
- $revisions = $scmPlugin->getCommits($project, null,
self::NB_COMMITS_TO_DISPLAY);
+ $revisions = array_merge($revisions,
$scmPlugin->getCommits($project, null, self::NB_COMMITS_TO_DISPLAY));
}
if ($project->usesPlugin('scmgit') && forge_check_perm('scm',
$project->getID(), 'read')) {
$scmPlugin = plugin_get_object('scmgit');
- $revisions = $scmPlugin->getCommits($project, null,
self::NB_COMMITS_TO_DISPLAY);
+ $revisions = array_merge($revisions,
$scmPlugin->getCommits($project, null, self::NB_COMMITS_TO_DISPLAY));
}
if (count($revisions) > 0) {
foreach ($revisions as $key => $revision) {
-----------------------------------------------------------------------
Summary of changes:
src/common/widget/Widget_MyLatestCommits.class.php | 4 ++--
src/common/widget/Widget_ProjectLatestCommits.class.php | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/common/widget/Widget_MyLatestCommits.class.php
b/src/common/widget/Widget_MyLatestCommits.class.php
index fe3b4d9..2150829 100644
--- a/src/common/widget/Widget_MyLatestCommits.class.php
+++ b/src/common/widget/Widget_MyLatestCommits.class.php
@@ -77,11 +77,11 @@ class Widget_MyLatestCommits extends Widget {
$revisions = array();
if ($project->usesPlugin('scmsvn') &&
forge_check_perm('scm', $project->getID(), 'read')) {
$scmPlugin = plugin_get_object('scmsvn');
- $revisions = $scmPlugin->getCommits($project,
$user, $this->_nb_commits);
+ $revisions = array_merge($revisions,
$scmPlugin->getCommits($project, $user, $this->_nb_commits));
}
if ($project->usesPlugin('scmgit') &&
forge_check_perm('scm', $project->getID(), 'read')) {
$scmPlugin = plugin_get_object('scmgit');
- $revisions = $scmPlugin->getCommits($project,
$user, $this->_nb_commits);
+ $revisions = array_merge($revisions,
$scmPlugin->getCommits($project, $user, $this->_nb_commits));
}
if (count($revisions) > 0) {
$global_nb_revisions += count($revisions);
diff --git a/src/common/widget/Widget_ProjectLatestCommits.class.php
b/src/common/widget/Widget_ProjectLatestCommits.class.php
index 30f8562..7a0d681 100644
--- a/src/common/widget/Widget_ProjectLatestCommits.class.php
+++ b/src/common/widget/Widget_ProjectLatestCommits.class.php
@@ -56,11 +56,11 @@ class Widget_ProjectLatestCommits extends Widget {
$revisions = array();
if ($project->usesPlugin('scmsvn') && forge_check_perm('scm',
$project->getID(), 'read')) {
$scmPlugin = plugin_get_object('scmsvn');
- $revisions = $scmPlugin->getCommits($project, null,
self::NB_COMMITS_TO_DISPLAY);
+ $revisions = array_merge($revisions,
$scmPlugin->getCommits($project, null, self::NB_COMMITS_TO_DISPLAY));
}
if ($project->usesPlugin('scmgit') && forge_check_perm('scm',
$project->getID(), 'read')) {
$scmPlugin = plugin_get_object('scmgit');
- $revisions = $scmPlugin->getCommits($project, null,
self::NB_COMMITS_TO_DISPLAY);
+ $revisions = array_merge($revisions,
$scmPlugin->getCommits($project, null, self::NB_COMMITS_TO_DISPLAY));
}
if (count($revisions) > 0) {
foreach ($revisions as $key => $revision) {
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
