Bsitu has uploaded a new change for review.
https://gerrit.wikimedia.org/r/146645
Change subject: IP userpages should link to their Special:Contributions
......................................................................
IP userpages should link to their Special:Contributions
Bug: 67641
Change-Id: I5d001e83e1505823164cedbf6ac896c10a24603a
---
M handlebars/compiled/flow_block_topic_moderate_post.handlebars.php
M handlebars/compiled/flow_block_topic_moderate_topic.handlebars.php
M handlebars/compiled/flow_post.handlebars.php
M handlebars/flow_post_author.handlebars
M includes/Formatter/RevisionFormatter.php
5 files changed, 117 insertions(+), 30 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/45/146645/1
diff --git a/handlebars/compiled/flow_block_topic_moderate_post.handlebars.php
b/handlebars/compiled/flow_block_topic_moderate_post.handlebars.php
index 999efc2..2a6f29b 100644
--- a/handlebars/compiled/flow_block_topic_moderate_post.handlebars.php
+++ b/handlebars/compiled/flow_block_topic_moderate_post.handlebars.php
@@ -19,6 +19,7 @@
),
'blockhelpers' => Array(),
'hbhelpers' => Array( 'eachPost' =>
'Flow\TemplateHelper::eachPost',
+ 'ifCond' => 'Flow\TemplateHelper::ifCond',
),
'scopes' => Array($in),
'sp_vars' => Array(),
@@ -63,15 +64,28 @@
'.((!LCRun3::ifvar($cx, ((is_array($in) &&
isset($in['isPreview'])) ? $in['isPreview'] : null))) ? '
<span class="flow-author">
'.((LCRun3::ifvar($cx, ((is_array($in) && isset($in['links']))
? $in['links'] : null))) ? '
- <a
href="'.htmlentities(((is_array($in['links']['contribs']) &&
isset($in['links']['contribs']['url'])) ? $in['links']['contribs']['url'] :
null), ENT_QUOTES, 'UTF-8').'"
-
title="'.htmlentities(((is_array($in['links']['contribs']) &&
isset($in['links']['contribs']['title'])) ? $in['links']['contribs']['title'] :
null), ENT_QUOTES, 'UTF-8').'"
- class="'.((!LCRun3::ifvar($cx,
((is_array($in['links']['contribs']) &&
isset($in['links']['contribs']['exists'])) ? $in['links']['contribs']['exists']
: null))) ? 'new ' : '').'mw-userlink flow-ui-tooltip-target">
+ '.((LCRun3::ifvar($cx, ((is_array($in['links']) &&
isset($in['links']['contribs'])) ? $in['links']['contribs'] : null))) ? '
+ <a
href="'.htmlentities(((is_array($in['links']['contribs']) &&
isset($in['links']['contribs']['url'])) ? $in['links']['contribs']['url'] :
null), ENT_QUOTES, 'UTF-8').'"
+
title="'.htmlentities(((is_array($in['links']['contribs']) &&
isset($in['links']['contribs']['title'])) ? $in['links']['contribs']['title'] :
null), ENT_QUOTES, 'UTF-8').'"
+ class="'.((!LCRun3::ifvar($cx,
((is_array($in['links']['contribs']) &&
isset($in['links']['contribs']['exists'])) ? $in['links']['contribs']['exists']
: null))) ? 'new ' : '').'mw-userlink flow-ui-tooltip-target">
+ ' : '').'
'.((LCRun3::ifvar($cx, ((is_array($in) &&
isset($in['name'])) ? $in['name'] : null))) ? '
'.htmlentities(((is_array($in) &&
isset($in['name'])) ? $in['name'] : null), ENT_QUOTES, 'UTF-8').'' : '
'.LCRun3::ch($cx, 'l10n',
Array(Array('flow-anonymous'),Array()), 'encq').'
').'
- </a>
- <span class="mw-usertoollinks">(<a
href="'.htmlentities(((is_array($in['links']['talk']) &&
isset($in['links']['talk']['url'])) ? $in['links']['talk']['url'] : null),
ENT_QUOTES, 'UTF-8').'" class="'.((!LCRun3::ifvar($cx,
((is_array($in['links']['talk']) && isset($in['links']['talk']['exists'])) ?
$in['links']['talk']['exists'] : null))) ? 'new ' : '').'
flow-ui-tooltip-target" title="'.htmlentities(((is_array($in['links']['talk'])
&& isset($in['links']['talk']['title'])) ? $in['links']['talk']['title'] :
null), ENT_QUOTES, 'UTF-8').'">'.LCRun3::ch($cx, 'l10n',
Array(Array('talkpagelinktext'),Array()), 'encq').'</a>'.((LCRun3::ifvar($cx,
((is_array($in['links']) && isset($in['links']['block'])) ?
$in['links']['block'] : null))) ? ' | <a class="'.((!LCRun3::ifvar($cx,
((is_array($in['links']['block']) && isset($in['links']['block']['exists'])) ?
$in['links']['block']['exists'] : null))) ? 'new ' : '').'
flow-ui-tooltip-target" href="'.htmlentities(((is_array($in['links']['block'])
&& isset($in['links']['block']['url'])) ? $in['links']['block']['url'] : null),
ENT_QUOTES, 'UTF-8').'" title="'.htmlentities(((is_array($in['links']['block'])
&& isset($in['links']['block']['title'])) ? $in['links']['block']['title'] :
null), ENT_QUOTES, 'UTF-8').'">'.LCRun3::ch($cx, 'l10n',
Array(Array('blocklink'),Array()), 'encq').'</a>' : '').')</span>
+ '.((LCRun3::ifvar($cx, ((is_array($in['links']) &&
isset($in['links']['contribs'])) ? $in['links']['contribs'] : null))) ? '
+ </a>
+ ' : '').'
+ <span class="mw-usertoollinks">'.LCRun3::hbch($cx,
'ifCond', Array(Array(((is_array($in['links']) && isset($in['links']['talk']))
? $in['links']['talk'] : null),'or',((is_array($in['links']) &&
isset($in['links']['block'])) ? $in['links']['block'] : null)),Array()), $in,
function($cx, $in) {return '(';}).''.((LCRun3::ifvar($cx,
((is_array($in['links']) && isset($in['links']['talk'])) ? $in['links']['talk']
: null))) ? '<a href="'.htmlentities(((is_array($in['links']['talk']) &&
isset($in['links']['talk']['url'])) ? $in['links']['talk']['url'] : null),
ENT_QUOTES, 'UTF-8').'"
+ class="'.((!LCRun3::ifvar($cx,
((is_array($in['links']['talk']) && isset($in['links']['talk']['exists'])) ?
$in['links']['talk']['exists'] : null))) ? 'new ' : '').'
flow-ui-tooltip-target"
+
title="'.htmlentities(((is_array($in['links']['talk']) &&
isset($in['links']['talk']['title'])) ? $in['links']['talk']['title'] : null),
ENT_QUOTES, 'UTF-8').'">
+ '.LCRun3::ch($cx, 'l10n',
Array(Array('talkpagelinktext'),Array()), 'encq').'
+ </a>' : '').''.((LCRun3::ifvar($cx,
((is_array($in['links']) && isset($in['links']['talk'])) ? $in['links']['talk']
: null))) ? ''.((LCRun3::ifvar($cx, ((is_array($in['links']) &&
isset($in['links']['block'])) ? $in['links']['block'] : null))) ? '|' : '').''
: '').''.((LCRun3::ifvar($cx, ((is_array($in['links']) &&
isset($in['links']['block'])) ? $in['links']['block'] : null))) ? '<a
class="'.((!LCRun3::ifvar($cx, ((is_array($in['links']['block']) &&
isset($in['links']['block']['exists'])) ? $in['links']['block']['exists'] :
null))) ? 'new ' : '').'
+ flow-ui-tooltip-target"
+
href="'.htmlentities(((is_array($in['links']['block']) &&
isset($in['links']['block']['url'])) ? $in['links']['block']['url'] : null),
ENT_QUOTES, 'UTF-8').'"
+
title="'.htmlentities(((is_array($in['links']['block']) &&
isset($in['links']['block']['title'])) ? $in['links']['block']['title'] :
null), ENT_QUOTES, 'UTF-8').'">
+ '.LCRun3::ch($cx, 'l10n',
Array(Array('blocklink'),Array()), 'encq').'
+ </a>' : '').''.LCRun3::hbch($cx,
'ifCond', Array(Array(((is_array($in['links']) && isset($in['links']['talk']))
? $in['links']['talk'] : null),'or',((is_array($in['links']) &&
isset($in['links']['block'])) ? $in['links']['block'] : null)),Array()), $in,
function($cx, $in) {return ')';}).'</span>
' : '').'
</span>
' : '
diff --git a/handlebars/compiled/flow_block_topic_moderate_topic.handlebars.php
b/handlebars/compiled/flow_block_topic_moderate_topic.handlebars.php
index 999efc2..2a6f29b 100644
--- a/handlebars/compiled/flow_block_topic_moderate_topic.handlebars.php
+++ b/handlebars/compiled/flow_block_topic_moderate_topic.handlebars.php
@@ -19,6 +19,7 @@
),
'blockhelpers' => Array(),
'hbhelpers' => Array( 'eachPost' =>
'Flow\TemplateHelper::eachPost',
+ 'ifCond' => 'Flow\TemplateHelper::ifCond',
),
'scopes' => Array($in),
'sp_vars' => Array(),
@@ -63,15 +64,28 @@
'.((!LCRun3::ifvar($cx, ((is_array($in) &&
isset($in['isPreview'])) ? $in['isPreview'] : null))) ? '
<span class="flow-author">
'.((LCRun3::ifvar($cx, ((is_array($in) && isset($in['links']))
? $in['links'] : null))) ? '
- <a
href="'.htmlentities(((is_array($in['links']['contribs']) &&
isset($in['links']['contribs']['url'])) ? $in['links']['contribs']['url'] :
null), ENT_QUOTES, 'UTF-8').'"
-
title="'.htmlentities(((is_array($in['links']['contribs']) &&
isset($in['links']['contribs']['title'])) ? $in['links']['contribs']['title'] :
null), ENT_QUOTES, 'UTF-8').'"
- class="'.((!LCRun3::ifvar($cx,
((is_array($in['links']['contribs']) &&
isset($in['links']['contribs']['exists'])) ? $in['links']['contribs']['exists']
: null))) ? 'new ' : '').'mw-userlink flow-ui-tooltip-target">
+ '.((LCRun3::ifvar($cx, ((is_array($in['links']) &&
isset($in['links']['contribs'])) ? $in['links']['contribs'] : null))) ? '
+ <a
href="'.htmlentities(((is_array($in['links']['contribs']) &&
isset($in['links']['contribs']['url'])) ? $in['links']['contribs']['url'] :
null), ENT_QUOTES, 'UTF-8').'"
+
title="'.htmlentities(((is_array($in['links']['contribs']) &&
isset($in['links']['contribs']['title'])) ? $in['links']['contribs']['title'] :
null), ENT_QUOTES, 'UTF-8').'"
+ class="'.((!LCRun3::ifvar($cx,
((is_array($in['links']['contribs']) &&
isset($in['links']['contribs']['exists'])) ? $in['links']['contribs']['exists']
: null))) ? 'new ' : '').'mw-userlink flow-ui-tooltip-target">
+ ' : '').'
'.((LCRun3::ifvar($cx, ((is_array($in) &&
isset($in['name'])) ? $in['name'] : null))) ? '
'.htmlentities(((is_array($in) &&
isset($in['name'])) ? $in['name'] : null), ENT_QUOTES, 'UTF-8').'' : '
'.LCRun3::ch($cx, 'l10n',
Array(Array('flow-anonymous'),Array()), 'encq').'
').'
- </a>
- <span class="mw-usertoollinks">(<a
href="'.htmlentities(((is_array($in['links']['talk']) &&
isset($in['links']['talk']['url'])) ? $in['links']['talk']['url'] : null),
ENT_QUOTES, 'UTF-8').'" class="'.((!LCRun3::ifvar($cx,
((is_array($in['links']['talk']) && isset($in['links']['talk']['exists'])) ?
$in['links']['talk']['exists'] : null))) ? 'new ' : '').'
flow-ui-tooltip-target" title="'.htmlentities(((is_array($in['links']['talk'])
&& isset($in['links']['talk']['title'])) ? $in['links']['talk']['title'] :
null), ENT_QUOTES, 'UTF-8').'">'.LCRun3::ch($cx, 'l10n',
Array(Array('talkpagelinktext'),Array()), 'encq').'</a>'.((LCRun3::ifvar($cx,
((is_array($in['links']) && isset($in['links']['block'])) ?
$in['links']['block'] : null))) ? ' | <a class="'.((!LCRun3::ifvar($cx,
((is_array($in['links']['block']) && isset($in['links']['block']['exists'])) ?
$in['links']['block']['exists'] : null))) ? 'new ' : '').'
flow-ui-tooltip-target" href="'.htmlentities(((is_array($in['links']['block'])
&& isset($in['links']['block']['url'])) ? $in['links']['block']['url'] : null),
ENT_QUOTES, 'UTF-8').'" title="'.htmlentities(((is_array($in['links']['block'])
&& isset($in['links']['block']['title'])) ? $in['links']['block']['title'] :
null), ENT_QUOTES, 'UTF-8').'">'.LCRun3::ch($cx, 'l10n',
Array(Array('blocklink'),Array()), 'encq').'</a>' : '').')</span>
+ '.((LCRun3::ifvar($cx, ((is_array($in['links']) &&
isset($in['links']['contribs'])) ? $in['links']['contribs'] : null))) ? '
+ </a>
+ ' : '').'
+ <span class="mw-usertoollinks">'.LCRun3::hbch($cx,
'ifCond', Array(Array(((is_array($in['links']) && isset($in['links']['talk']))
? $in['links']['talk'] : null),'or',((is_array($in['links']) &&
isset($in['links']['block'])) ? $in['links']['block'] : null)),Array()), $in,
function($cx, $in) {return '(';}).''.((LCRun3::ifvar($cx,
((is_array($in['links']) && isset($in['links']['talk'])) ? $in['links']['talk']
: null))) ? '<a href="'.htmlentities(((is_array($in['links']['talk']) &&
isset($in['links']['talk']['url'])) ? $in['links']['talk']['url'] : null),
ENT_QUOTES, 'UTF-8').'"
+ class="'.((!LCRun3::ifvar($cx,
((is_array($in['links']['talk']) && isset($in['links']['talk']['exists'])) ?
$in['links']['talk']['exists'] : null))) ? 'new ' : '').'
flow-ui-tooltip-target"
+
title="'.htmlentities(((is_array($in['links']['talk']) &&
isset($in['links']['talk']['title'])) ? $in['links']['talk']['title'] : null),
ENT_QUOTES, 'UTF-8').'">
+ '.LCRun3::ch($cx, 'l10n',
Array(Array('talkpagelinktext'),Array()), 'encq').'
+ </a>' : '').''.((LCRun3::ifvar($cx,
((is_array($in['links']) && isset($in['links']['talk'])) ? $in['links']['talk']
: null))) ? ''.((LCRun3::ifvar($cx, ((is_array($in['links']) &&
isset($in['links']['block'])) ? $in['links']['block'] : null))) ? '|' : '').''
: '').''.((LCRun3::ifvar($cx, ((is_array($in['links']) &&
isset($in['links']['block'])) ? $in['links']['block'] : null))) ? '<a
class="'.((!LCRun3::ifvar($cx, ((is_array($in['links']['block']) &&
isset($in['links']['block']['exists'])) ? $in['links']['block']['exists'] :
null))) ? 'new ' : '').'
+ flow-ui-tooltip-target"
+
href="'.htmlentities(((is_array($in['links']['block']) &&
isset($in['links']['block']['url'])) ? $in['links']['block']['url'] : null),
ENT_QUOTES, 'UTF-8').'"
+
title="'.htmlentities(((is_array($in['links']['block']) &&
isset($in['links']['block']['title'])) ? $in['links']['block']['title'] :
null), ENT_QUOTES, 'UTF-8').'">
+ '.LCRun3::ch($cx, 'l10n',
Array(Array('blocklink'),Array()), 'encq').'
+ </a>' : '').''.LCRun3::hbch($cx,
'ifCond', Array(Array(((is_array($in['links']) && isset($in['links']['talk']))
? $in['links']['talk'] : null),'or',((is_array($in['links']) &&
isset($in['links']['block'])) ? $in['links']['block'] : null)),Array()), $in,
function($cx, $in) {return ')';}).'</span>
' : '').'
</span>
' : '
diff --git a/handlebars/compiled/flow_post.handlebars.php
b/handlebars/compiled/flow_post.handlebars.php
index ecbdd87..c27044c 100644
--- a/handlebars/compiled/flow_post.handlebars.php
+++ b/handlebars/compiled/flow_post.handlebars.php
@@ -16,6 +16,7 @@
),
'blockhelpers' => Array(),
'hbhelpers' => Array( 'eachPost' =>
'Flow\TemplateHelper::eachPost',
+ 'ifCond' => 'Flow\TemplateHelper::ifCond',
),
'scopes' => Array($in),
'sp_vars' => Array(),
@@ -33,15 +34,28 @@
'.((!LCRun3::ifvar($cx, ((is_array($in) &&
isset($in['isPreview'])) ? $in['isPreview'] : null))) ? '
<span class="flow-author">
'.((LCRun3::ifvar($cx, ((is_array($in) && isset($in['links']))
? $in['links'] : null))) ? '
- <a
href="'.htmlentities(((is_array($in['links']['contribs']) &&
isset($in['links']['contribs']['url'])) ? $in['links']['contribs']['url'] :
null), ENT_QUOTES, 'UTF-8').'"
-
title="'.htmlentities(((is_array($in['links']['contribs']) &&
isset($in['links']['contribs']['title'])) ? $in['links']['contribs']['title'] :
null), ENT_QUOTES, 'UTF-8').'"
- class="'.((!LCRun3::ifvar($cx,
((is_array($in['links']['contribs']) &&
isset($in['links']['contribs']['exists'])) ? $in['links']['contribs']['exists']
: null))) ? 'new ' : '').'mw-userlink flow-ui-tooltip-target">
+ '.((LCRun3::ifvar($cx, ((is_array($in['links']) &&
isset($in['links']['contribs'])) ? $in['links']['contribs'] : null))) ? '
+ <a
href="'.htmlentities(((is_array($in['links']['contribs']) &&
isset($in['links']['contribs']['url'])) ? $in['links']['contribs']['url'] :
null), ENT_QUOTES, 'UTF-8').'"
+
title="'.htmlentities(((is_array($in['links']['contribs']) &&
isset($in['links']['contribs']['title'])) ? $in['links']['contribs']['title'] :
null), ENT_QUOTES, 'UTF-8').'"
+ class="'.((!LCRun3::ifvar($cx,
((is_array($in['links']['contribs']) &&
isset($in['links']['contribs']['exists'])) ? $in['links']['contribs']['exists']
: null))) ? 'new ' : '').'mw-userlink flow-ui-tooltip-target">
+ ' : '').'
'.((LCRun3::ifvar($cx, ((is_array($in) &&
isset($in['name'])) ? $in['name'] : null))) ? '
'.htmlentities(((is_array($in) &&
isset($in['name'])) ? $in['name'] : null), ENT_QUOTES, 'UTF-8').'' : '
'.LCRun3::ch($cx, 'l10n',
Array(Array('flow-anonymous'),Array()), 'encq').'
').'
- </a>
- <span class="mw-usertoollinks">(<a
href="'.htmlentities(((is_array($in['links']['talk']) &&
isset($in['links']['talk']['url'])) ? $in['links']['talk']['url'] : null),
ENT_QUOTES, 'UTF-8').'" class="'.((!LCRun3::ifvar($cx,
((is_array($in['links']['talk']) && isset($in['links']['talk']['exists'])) ?
$in['links']['talk']['exists'] : null))) ? 'new ' : '').'
flow-ui-tooltip-target" title="'.htmlentities(((is_array($in['links']['talk'])
&& isset($in['links']['talk']['title'])) ? $in['links']['talk']['title'] :
null), ENT_QUOTES, 'UTF-8').'">'.LCRun3::ch($cx, 'l10n',
Array(Array('talkpagelinktext'),Array()), 'encq').'</a>'.((LCRun3::ifvar($cx,
((is_array($in['links']) && isset($in['links']['block'])) ?
$in['links']['block'] : null))) ? ' | <a class="'.((!LCRun3::ifvar($cx,
((is_array($in['links']['block']) && isset($in['links']['block']['exists'])) ?
$in['links']['block']['exists'] : null))) ? 'new ' : '').'
flow-ui-tooltip-target" href="'.htmlentities(((is_array($in['links']['block'])
&& isset($in['links']['block']['url'])) ? $in['links']['block']['url'] : null),
ENT_QUOTES, 'UTF-8').'" title="'.htmlentities(((is_array($in['links']['block'])
&& isset($in['links']['block']['title'])) ? $in['links']['block']['title'] :
null), ENT_QUOTES, 'UTF-8').'">'.LCRun3::ch($cx, 'l10n',
Array(Array('blocklink'),Array()), 'encq').'</a>' : '').')</span>
+ '.((LCRun3::ifvar($cx, ((is_array($in['links']) &&
isset($in['links']['contribs'])) ? $in['links']['contribs'] : null))) ? '
+ </a>
+ ' : '').'
+ <span class="mw-usertoollinks">'.LCRun3::hbch($cx,
'ifCond', Array(Array(((is_array($in['links']) && isset($in['links']['talk']))
? $in['links']['talk'] : null),'or',((is_array($in['links']) &&
isset($in['links']['block'])) ? $in['links']['block'] : null)),Array()), $in,
function($cx, $in) {return '(';}).''.((LCRun3::ifvar($cx,
((is_array($in['links']) && isset($in['links']['talk'])) ? $in['links']['talk']
: null))) ? '<a href="'.htmlentities(((is_array($in['links']['talk']) &&
isset($in['links']['talk']['url'])) ? $in['links']['talk']['url'] : null),
ENT_QUOTES, 'UTF-8').'"
+ class="'.((!LCRun3::ifvar($cx,
((is_array($in['links']['talk']) && isset($in['links']['talk']['exists'])) ?
$in['links']['talk']['exists'] : null))) ? 'new ' : '').'
flow-ui-tooltip-target"
+
title="'.htmlentities(((is_array($in['links']['talk']) &&
isset($in['links']['talk']['title'])) ? $in['links']['talk']['title'] : null),
ENT_QUOTES, 'UTF-8').'">
+ '.LCRun3::ch($cx, 'l10n',
Array(Array('talkpagelinktext'),Array()), 'encq').'
+ </a>' : '').''.((LCRun3::ifvar($cx,
((is_array($in['links']) && isset($in['links']['talk'])) ? $in['links']['talk']
: null))) ? ''.((LCRun3::ifvar($cx, ((is_array($in['links']) &&
isset($in['links']['block'])) ? $in['links']['block'] : null))) ? '|' : '').''
: '').''.((LCRun3::ifvar($cx, ((is_array($in['links']) &&
isset($in['links']['block'])) ? $in['links']['block'] : null))) ? '<a
class="'.((!LCRun3::ifvar($cx, ((is_array($in['links']['block']) &&
isset($in['links']['block']['exists'])) ? $in['links']['block']['exists'] :
null))) ? 'new ' : '').'
+ flow-ui-tooltip-target"
+
href="'.htmlentities(((is_array($in['links']['block']) &&
isset($in['links']['block']['url'])) ? $in['links']['block']['url'] : null),
ENT_QUOTES, 'UTF-8').'"
+
title="'.htmlentities(((is_array($in['links']['block']) &&
isset($in['links']['block']['title'])) ? $in['links']['block']['title'] :
null), ENT_QUOTES, 'UTF-8').'">
+ '.LCRun3::ch($cx, 'l10n',
Array(Array('blocklink'),Array()), 'encq').'
+ </a>' : '').''.LCRun3::hbch($cx,
'ifCond', Array(Array(((is_array($in['links']) && isset($in['links']['talk']))
? $in['links']['talk'] : null),'or',((is_array($in['links']) &&
isset($in['links']['block'])) ? $in['links']['block'] : null)),Array()), $in,
function($cx, $in) {return ')';}).'</span>
' : '').'
</span>
' : '
diff --git a/handlebars/flow_post_author.handlebars
b/handlebars/flow_post_author.handlebars
index 4003a94..fdff2e4 100644
--- a/handlebars/flow_post_author.handlebars
+++ b/handlebars/flow_post_author.handlebars
@@ -1,16 +1,41 @@
{{#unless isPreview}}
<span class="flow-author">
{{#if links}}
- <a href="{{links.contribs.url}}"
- title="{{links.contribs.title}}"
- class="{{#unless links.contribs.exists}}new
{{/unless}}mw-userlink flow-ui-tooltip-target">
+ {{#if links.contribs}}
+ <a href="{{links.contribs.url}}"
+ title="{{links.contribs.title}}"
+ class="{{#unless links.contribs.exists}}new
{{/unless}}mw-userlink flow-ui-tooltip-target">
+ {{/if}}
{{#if name}}
{{~name~}}
{{else}}
{{~l10n "flow-anonymous"}}
{{/if}}
- </a>
- <span class="mw-usertoollinks">(<a
href="{{links.talk.url}}" class="{{#unless links.talk.exists}}new {{/unless}}
flow-ui-tooltip-target" title="{{links.talk.title}}">{{l10n
"talkpagelinktext"}}</a>{{#if links.block}} | <a class="{{#unless
links.block.exists}}new {{/unless}} flow-ui-tooltip-target"
href="{{links.block.url}}" title="{{links.block.title}}">{{l10n
"blocklink"}}</a>{{/if}})</span>
+ {{#if links.contribs}}
+ </a>
+ {{/if}}
+ <span class="mw-usertoollinks">
+ {{~#ifCond links.talk "or"
links.block~}}({{~/ifCond~}}
+ {{~#if links.talk~}}
+ <a href="{{links.talk.url}}"
+ class="{{#unless
links.talk.exists}}new {{/unless}} flow-ui-tooltip-target"
+ title="{{links.talk.title}}">
+ {{l10n "talkpagelinktext"}}
+ </a>
+ {{~/if~}}
+ {{~#if links.talk~}}
+ {{~#if links.block~}} | {{~/if~}}
+ {{~/if~}}
+ {{~#if links.block~}}
+ <a class="{{#unless
links.block.exists}}new {{/unless}}
+ flow-ui-tooltip-target"
+ href="{{links.block.url}}"
+ title="{{links.block.title}}">
+ {{l10n "blocklink"}}
+ </a>
+ {{~/if~}}
+ {{~#ifCond links.talk "or"
links.block~}}){{~/ifCond~}}
+ </span>
{{/if}}
</span>
{{else}}
diff --git a/includes/Formatter/RevisionFormatter.php
b/includes/Formatter/RevisionFormatter.php
index 2a3257b..fb64b02 100644
--- a/includes/Formatter/RevisionFormatter.php
+++ b/includes/Formatter/RevisionFormatter.php
@@ -239,21 +239,40 @@
if ( isset( $this->userLinks[$name] ) ) {
return $this->userLinks[$name];
}
+
+ $userContribsTitle = $talkPageTitle = null;
$userTitle = \Title::newFromText( $name, NS_USER );
- $talkPageTitle = $userTitle->getTalkPage();
+ if ( $userTitle ) {
+ $talkPageTitle = $userTitle->getTalkPage();
+ }
+ if ( !$userData['id'] ) {
+ $userContribsTitle = \SpecialPage::getTitleFor(
'Contributions', $name );
+ }
+
$blockTitle = \SpecialPage::getTitleFor( 'Block', $name );
- $links = array(
- "contribs" => array(
+
+ $links = array();
+ if ( $userContribsTitle ) {
+ $links['contribs'] = array(
+ 'url' => $userContribsTitle->getLocalUrl(),
+ 'title' => $userContribsTitle->getText(),
+ 'exists' => true
+ );
+ } elseif ( $userTitle ) {
+ $links['contribs'] = array(
'url' => $userTitle->getLocalUrl(),
'title' => $userTitle->getText(),
- 'exists' => $userTitle->exists(),
- ),
- "talk" => array(
+ 'exists' => $userTitle->exists()
+ );
+ }
+
+ if ( $talkPageTitle ) {
+ $links['talk'] = array(
'url' => $talkPageTitle->getLocalUrl(),
'title' => $talkPageTitle->getPrefixedText(),
- 'exists' => $talkPageTitle->exists(),
- ),
- );
+ 'exists' => $talkPageTitle->exists()
+ );
+ }
// is this right permissions? typically this would
// be sourced from Linker::userToolLinks, but that
// only undertands html strings.
@@ -263,7 +282,7 @@
"block" => array(
'url' => $blockTitle->getLocalUrl(),
'title' => wfMessage( 'blocklink' ),
- 'exists' => $blockTitle->exists(), //
this should always exist
+ 'exists' => true
),
);
}
@@ -278,6 +297,7 @@
'wiki' => $userWiki,
'gender' => 'unknown',
'links' => array(),
+ 'id' => $userId
);
// Only works for the local wiki
if ( wfWikiId() === $userWiki ) {
--
To view, visit https://gerrit.wikimedia.org/r/146645
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5d001e83e1505823164cedbf6ac896c10a24603a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Bsitu <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
