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 09488e3d5039729fa11c48af06a5a2117f0d5f21 (commit)
from 3c72f28ad01b4fdad088d1c03feb6c88c540929d (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=09488e3d5039729fa11c48af06a5a2117f0d5f21
commit 09488e3d5039729fa11c48af06a5a2117f0d5f21
Author: Franck Villaume <[email protected]>
Date: Fri Nov 3 14:08:22 2017 +0000
mediawiki activity: clean-up
diff --git a/src/common/include/Activity.class.php
b/src/common/include/Activity.class.php
index df699a2..19ff7e8 100644
--- a/src/common/include/Activity.class.php
+++ b/src/common/include/Activity.class.php
@@ -61,9 +61,10 @@ class Activity extends FFError {
$cached_perms[$s][$ref] =
forge_check_perm('docman', $group_id, 'read');
break;
}
- case 'mediawiki':
+ case 'mediawiki': {
$cached_perms[$s][$ref] =
forge_check_perm('plugin_mediawiki_read', $group_id, 'read');
break;
+ }
default: {
// Must be a bug somewhere, we're
supposed to handle all types
$cached_perms[$s][$ref] = false;
diff --git a/src/plugins/mediawiki/common/mediawikiPlugin.class.php
b/src/plugins/mediawiki/common/mediawikiPlugin.class.php
index d757d77..83be82c 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|type|ns|title|ids|timestamp';
+
.'rcprop=user|title|ids|timestamp';
$filename = tempnam('/tmp', 'mediawikilog');
$f = fopen($filename, 'w');
$ch = curl_init();
@@ -419,7 +419,13 @@ _('This plugin allows each project to embed Mediawiki
under a tab.');
}
$title .=
$recentchanges['title'];
$result['title'] = $title;
- $result['icon'] =
html_abs_image(util_make_url('/plugins/'.$this->name.'/wiki/'.$project->getUnixName().'/skins/monobook/wiki.png'),'20','20',array('alt'=>'Mediawiki'));
+ $result['icon'] =
html_abs_image('/plugins/'.$this->name.'/wiki/'.$project->getUnixName().'/skins/monobook/wiki.png','20','20',array('alt'=>'Mediawiki'));
+ if
(isset($recentchanges['user'])) {
+ $userObject =
user_get_object_by_name(strtolower($recentchanges['user']));
+ if (is_a($userObject,
'FFUser')) {
+
$result['realname'] = util_display_user($userObject->getUnixName(),
$userObject->getID(), $userObject->getRealName());
+ }
+ }
$params['results'][] = $result;
}
}
diff --git a/src/www/activity/index.php b/src/www/activity/index.php
index a782bfb..77b2377 100644
--- a/src/www/activity/index.php
+++ b/src/www/activity/index.php
@@ -254,7 +254,7 @@ echo $HTML->closeForm();
$cells[][] = date('H:i:s',$arr['activity_date']);
$cells[][] = $displayinfo;
if (isset($arr['user_name']) && $arr['user_name']) {
- $cells[][] =
util_display_user($arr['user_name'], $arr['user_id'],$arr['realname']);
+ $cells[][] =
util_display_user($arr['user_name'], $arr['user_id'], $arr['realname']);
} else {
$cells[][] = $arr['realname'];
}
-----------------------------------------------------------------------
Summary of changes:
src/common/include/Activity.class.php | 3 ++-
src/plugins/mediawiki/common/mediawikiPlugin.class.php | 10 ++++++++--
src/www/activity/index.php | 2 +-
3 files changed, 11 insertions(+), 4 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
