Merge branch 'master' into saravea

Conflicts:
	.gitmodules
	mod/admins
	mod/assemblies
	mod/audio_html5
	mod/beechat
	mod/crud
	mod/elgg-activitystreams
	mod/elggman
	mod/elggpg
	mod/favorites
	mod/federated-objects
	mod/friendly_time
	mod/group_alias
	mod/group_operators
	mod/languages
	mod/lightpics
	mod/openid_client
	mod/spotlight
	mod/suicide
	mod/tasks
	mod/videolist

1 files changed, 17 insertions, 0 deletions

diff --git a/mod/dokuwiki/views/default/river/dokuwiki.php b/mod/dokuwiki/views/default/river/dokuwiki.php
new file mode 100644
index 000000000..67e6f60e7
--- /dev/null
+++ b/mod/dokuwiki/views/default/river/dokuwiki.php
@@ -0,0 +1,17 @@
+<?php
+	// 'action_type'=>$action_type, 'subject_guid'=>$subject_guid, 'object_guid' =>$object_guid, 'item'=>$res
+	$user = get_entity($vars['item']->subject_guid);
+	$wiki = get_entity($vars['item']->object_guid);
+	$parts = explode("/", $vars['item']->action_type);
+	$id = $wiki->container_guid;
+	$namespace = "<a href='".$wiki->getURL()."?id=".$parts[2]."'>".$parts[2]."</a>";
+	if ($wiki_owner = get_entity($wiki->container_guid))
+		$wikifrom = sprintf(elgg_echo("dokuwiki:wikifrom"), $wiki_owner->name);
+	else
+		$wikifrom = elgg_echo("dokuwiki:sitewiki");
+	if ($wiki)
+	$wikiname = "<a href='".$wiki->getURL()."'>".$wikifrom."</a>";
+	if ($user)
+	$user_node = "<a href='".$user->getURL()."'>" . $user->name . "</a>";
+	echo sprintf(elgg_echo("dokuwiki:river:modified"), $user_node, $namespace, $wikiname);
+?>