... |
... |
@@ -1,7 +1,16 @@ |
1 |
1 |
{{velocity}} |
2 |
2 |
#set ($wikis = '') |
3 |
|
-#if ($services.wiki.currentWikiId != $services.wiki.mainWikiId) |
|
3 |
+#if ("$!xcontext.macro.params.wikis" != '') |
|
4 |
+ #set ($wikis = $xcontext.macro.params.wikis) |
|
5 |
+#elseif ($services.wiki.currentWikiId != $services.wiki.mainWikiId) |
4 |
4 |
#set ($wikis = $services.wiki.currentWikiId) |
5 |
5 |
#end |
6 |
|
-{{notifications useUserPreferences="false" displayOwnEvents="true" count="$xcontext.macro.params.entries" #if("$!xcontext.macro.params.wikis" != '')wikis="$xcontext.macro.params.wikis"#{else}wikis="$wikis"#end #if("$!xcontext.macro.params.spaces" != '')spaces="$xcontext.macro.params.spaces"#end #if("$!xcontext.macro.params.authors" != '')users="$xcontext.macro.params.authors"#end #if("$!xcontext.macro.params.tags" != '')tags="$xcontext.macro.params.tags"#end #if("$!xcontext.macro.params.minor" != '')displayMinorEvents="$xcontext.macro.params.minor"#end #if("$!xcontext.macro.params.rss" != '')displayRSSLink="$xcontext.macro.params.rss"#end /}} |
|
8 |
+{{notifications useUserPreferences="false" displayOwnEvents="true" |
|
9 |
+ count="$services.rendering.escape($xcontext.macro.params.entries, 'xwiki/2.1')" |
|
10 |
+ wikis="$services.rendering.escape($wikis, 'xwiki/2.1')" |
|
11 |
+ #if("$!xcontext.macro.params.spaces" != '')spaces="$services.rendering.escape($xcontext.macro.params.spaces, 'xwiki/2.1')"#end |
|
12 |
+ #if("$!xcontext.macro.params.authors" != '')users="$services.rendering.escape($xcontext.macro.params.authors, 'xwiki/2.1')"#end |
|
13 |
+ #if("$!xcontext.macro.params.tags" != '')tags="$services.rendering.escape($xcontext.macro.params.tags, 'xwiki/2.1')"#end |
|
14 |
+ #if("$!xcontext.macro.params.minor" != '')displayMinorEvents="$services.rendering.escape($xcontext.macro.params.minor, 'xwiki/2.1')"#end |
|
15 |
+ #if("$!xcontext.macro.params.rss" != '')displayRSSLink="$services.rendering.escape($xcontext.macro.params.rss, 'xwiki/2.1')"#end /}} |
7 |
7 |
{{/velocity}} |