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 78cf78c125a798331fe6bc551c87aa29c5bb127f (commit)
from e499db2971a901618f298737ac872a6aded8d251 (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=78cf78c125a798331fe6bc551c87aa29c5bb127f
commit 78cf78c125a798331fe6bc551c87aa29c5bb127f
Author: Franck Villaume <[email protected]>
Date: Tue Nov 14 09:51:09 2017 +0000
mediawiki: fix PHP warning & fix API URL call
diff --git a/src/plugins/mediawiki/common/mediawikiPlugin.class.php
b/src/plugins/mediawiki/common/mediawikiPlugin.class.php
index 83be82c..ea1bb94 100644
--- a/src/plugins/mediawiki/common/mediawikiPlugin.class.php
+++ b/src/plugins/mediawiki/common/mediawikiPlugin.class.php
@@ -381,7 +381,7 @@ _('This plugin allows each project to embed Mediawiki under
a tab.');
.'&rcstart='.date('Y-m-d\TH:i:s\Z',$params['end'])
.'&rcend='.date('Y-m-d\TH:i:s\Z',$params['begin'])
.'&rclimit=500'
-
.'rcprop=user|title|ids|timestamp';
+
.'&rcprop=user|title|ids|timestamp';
$filename = tempnam('/tmp', 'mediawikilog');
$f = fopen($filename, 'w');
$ch = curl_init();
@@ -406,6 +406,7 @@ _('This plugin allows each project to embed Mediawiki under
a tab.');
$result = array();
$result['section'] =
'mediawiki';
$result['group_id'] =
$group_id;
+ $result['ref_id'] = $group_id;
$result['activity_date'] =
strtotime($recentchanges['timestamp']);
$result['link'] =
forge_get_config('url_prefix').'plugins/'.$this->name.'/wiki/'.$project->getUnixName().'/index.php/'.str_replace('
', '_',
$recentchanges['title']);
@@ -425,6 +426,8 @@ _('This plugin allows each project to embed Mediawiki under
a tab.');
if (is_a($userObject,
'FFUser')) {
$result['realname'] = util_display_user($userObject->getUnixName(),
$userObject->getID(), $userObject->getRealName());
}
+ } else {
+ $result['realname'] =
'';
}
$params['results'][] = $result;
}
-----------------------------------------------------------------------
Summary of changes:
src/plugins/mediawiki/common/mediawikiPlugin.class.php | 5 ++++-
1 file 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
