jenkins-bot has submitted this change and it was merged.
Change subject: Replace symbolic link with partial
......................................................................
Replace symbolic link with partial
Windows and ExtensionDistributor currently have problems with
the:
flow_post.handlebars -> flow_post.partial.handlebars
symbolic link, so replace it with a partial.
Backports I447075b07b6000b765d56807d0cc8e23e4472f2b
Bug: T103702
Change-Id: I4eed303a4b9c384ef6782e8e0bb281fff00ad5a9
---
M Resources.php
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_block_topic_moderate_post.handlebars
M handlebars/flow_block_topic_moderate_topic.handlebars
D handlebars/flow_post.handlebars
A handlebars/flow_post.handlebars
R handlebars/flow_post_partial.partial.handlebars
9 files changed, 22 insertions(+), 19 deletions(-)
Approvals:
Mattflaschen: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Resources.php b/Resources.php
index ba2f2ff..9594c0d 100644
--- a/Resources.php
+++ b/Resources.php
@@ -74,6 +74,7 @@
'handlebars/flow_post_meta_actions.partial.handlebars',
'handlebars/flow_post_moderation_state.partial.handlebars',
'handlebars/flow_post_replies.partial.handlebars',
+ 'handlebars/flow_post_partial.partial.handlebars',
'handlebars/flow_post.handlebars',
'handlebars/flow_reply_form.partial.handlebars',
'handlebars/flow_subscribed.partial.handlebars',
diff --git a/handlebars/compiled/flow_block_topic_moderate_post.handlebars.php
b/handlebars/compiled/flow_block_topic_moderate_post.handlebars.php
index 71dd19b..bbd5f57 100644
--- a/handlebars/compiled/flow_block_topic_moderate_post.handlebars.php
+++ b/handlebars/compiled/flow_block_topic_moderate_post.handlebars.php
@@ -271,7 +271,7 @@
'.$sp.''.LCRun3::sec($cx, ((isset($in['replies']) && is_array($in)) ?
$in['replies'] : null), $in, true, function($cx, $in)use($sp){return
''.LCRun3::hbch($cx, 'eachPost',
array(array(((isset($cx['sp_vars']['root']['rootBlock']) &&
is_array($cx['sp_vars']['root'])) ? $cx['sp_vars']['root']['rootBlock'] :
null),$in),array()), $in, false, function($cx, $in)use($sp){return '
<!-- eachPost nested replies -->
'.$sp.' '.LCRun3::ch($cx, 'post',
array(array(((isset($cx['sp_vars']['root']['rootBlock']) &&
is_array($cx['sp_vars']['root'])) ? $cx['sp_vars']['root']['rootBlock'] :
null),$in),array()), 'encq').'
'.$sp.'';}).'';}).''.LCRun3::hbch($cx, 'ifCond',
array(array(((isset($cx['sp_vars']['root']['rootBlock']['submitted']['postId'])
&& is_array($cx['sp_vars']['root']['rootBlock']['submitted'])) ?
$cx['sp_vars']['root']['rootBlock']['submitted']['postId'] :
null),'===',((isset($in['postId']) && is_array($in)) ? $in['postId'] :
null)),array()), $in, false, function($cx, $in)use($sp){return
''.LCRun3::hbch($cx, 'ifCond',
array(array(((isset($cx['sp_vars']['root']['rootBlock']['submitted']['action'])
&& is_array($cx['sp_vars']['root']['rootBlock']['submitted'])) ?
$cx['sp_vars']['root']['rootBlock']['submitted']['action'] :
null),'===','reply'),array()), $in, false, function($cx, $in)use($sp){return
''.LCRun3::p($cx, 'flow_reply_form', array(array($in),array()), '
').'';}).'';}).'</div>
-';},'flow_post' => function ($cx, $in, $sp) {return ''.$sp.''.LCRun3::wi($cx,
((isset($in['revision']) && is_array($in)) ? $in['revision'] : null), $in,
function($cx, $in)use($sp){return ' <div
id="flow-post-'.htmlentities((string)((isset($in['postId']) && is_array($in)) ?
$in['postId'] : null), ENT_QUOTES, 'UTF-8').'"
+';},'flow_post_partial' => function ($cx, $in, $sp) {return
''.$sp.''.LCRun3::wi($cx, ((isset($in['revision']) && is_array($in)) ?
$in['revision'] : null), $in, function($cx, $in)use($sp){return ' <div
id="flow-post-'.htmlentities((string)((isset($in['postId']) && is_array($in)) ?
$in['postId'] : null), ENT_QUOTES, 'UTF-8').'"
'.$sp.' class="flow-post'.((LCRun3::ifvar($cx,
((isset($in['isMaxThreadingDepth']) && is_array($in)) ?
$in['isMaxThreadingDepth'] : null))) ? ' flow-post-max-depth' : '').'"
'.$sp.'
data-flow-id="'.htmlentities((string)((isset($in['postId']) && is_array($in)) ?
$in['postId'] : null), ENT_QUOTES, 'UTF-8').'"
'.$sp.' >
@@ -289,7 +289,7 @@
);
return '<div class="flow-board">
-'.LCRun3::sec($cx, ((isset($in['roots']) && is_array($in)) ? $in['roots'] :
null), $in, true, function($cx, $in) {return ''.LCRun3::hbch($cx, 'eachPost',
array(array(((isset($cx['sp_vars']['root']) && is_array($cx['sp_vars'])) ?
$cx['sp_vars']['root'] : null),$in),array()), $in, false, function($cx, $in)
{return ''.LCRun3::p($cx, 'flow_moderate_post', array(array($in),array()), '
').''.LCRun3::p($cx, 'flow_post', array(array($in),array()), '
').'';}).'';}).'</div>
+'.LCRun3::sec($cx, ((isset($in['roots']) && is_array($in)) ? $in['roots'] :
null), $in, true, function($cx, $in) {return ''.LCRun3::hbch($cx, 'eachPost',
array(array(((isset($cx['sp_vars']['root']) && is_array($cx['sp_vars'])) ?
$cx['sp_vars']['root'] : null),$in),array()), $in, false, function($cx, $in)
{return ''.LCRun3::p($cx, 'flow_moderate_post', array(array($in),array()), '
').''.LCRun3::p($cx, 'flow_post_partial',
array(array($in),array()), ' ').'';}).'';}).'</div>
';
}
?>
\ No newline at end of file
diff --git a/handlebars/compiled/flow_block_topic_moderate_topic.handlebars.php
b/handlebars/compiled/flow_block_topic_moderate_topic.handlebars.php
index f50c57d..ef4e465 100644
--- a/handlebars/compiled/flow_block_topic_moderate_topic.handlebars.php
+++ b/handlebars/compiled/flow_block_topic_moderate_topic.handlebars.php
@@ -271,7 +271,7 @@
'.$sp.''.LCRun3::sec($cx, ((isset($in['replies']) && is_array($in)) ?
$in['replies'] : null), $in, true, function($cx, $in)use($sp){return
''.LCRun3::hbch($cx, 'eachPost',
array(array(((isset($cx['sp_vars']['root']['rootBlock']) &&
is_array($cx['sp_vars']['root'])) ? $cx['sp_vars']['root']['rootBlock'] :
null),$in),array()), $in, false, function($cx, $in)use($sp){return '
<!-- eachPost nested replies -->
'.$sp.' '.LCRun3::ch($cx, 'post',
array(array(((isset($cx['sp_vars']['root']['rootBlock']) &&
is_array($cx['sp_vars']['root'])) ? $cx['sp_vars']['root']['rootBlock'] :
null),$in),array()), 'encq').'
'.$sp.'';}).'';}).''.LCRun3::hbch($cx, 'ifCond',
array(array(((isset($cx['sp_vars']['root']['rootBlock']['submitted']['postId'])
&& is_array($cx['sp_vars']['root']['rootBlock']['submitted'])) ?
$cx['sp_vars']['root']['rootBlock']['submitted']['postId'] :
null),'===',((isset($in['postId']) && is_array($in)) ? $in['postId'] :
null)),array()), $in, false, function($cx, $in)use($sp){return
''.LCRun3::hbch($cx, 'ifCond',
array(array(((isset($cx['sp_vars']['root']['rootBlock']['submitted']['action'])
&& is_array($cx['sp_vars']['root']['rootBlock']['submitted'])) ?
$cx['sp_vars']['root']['rootBlock']['submitted']['action'] :
null),'===','reply'),array()), $in, false, function($cx, $in)use($sp){return
''.LCRun3::p($cx, 'flow_reply_form', array(array($in),array()), '
').'';}).'';}).'</div>
-';},'flow_post' => function ($cx, $in, $sp) {return ''.$sp.''.LCRun3::wi($cx,
((isset($in['revision']) && is_array($in)) ? $in['revision'] : null), $in,
function($cx, $in)use($sp){return ' <div
id="flow-post-'.htmlentities((string)((isset($in['postId']) && is_array($in)) ?
$in['postId'] : null), ENT_QUOTES, 'UTF-8').'"
+';},'flow_post_partial' => function ($cx, $in, $sp) {return
''.$sp.''.LCRun3::wi($cx, ((isset($in['revision']) && is_array($in)) ?
$in['revision'] : null), $in, function($cx, $in)use($sp){return ' <div
id="flow-post-'.htmlentities((string)((isset($in['postId']) && is_array($in)) ?
$in['postId'] : null), ENT_QUOTES, 'UTF-8').'"
'.$sp.' class="flow-post'.((LCRun3::ifvar($cx,
((isset($in['isMaxThreadingDepth']) && is_array($in)) ?
$in['isMaxThreadingDepth'] : null))) ? ' flow-post-max-depth' : '').'"
'.$sp.'
data-flow-id="'.htmlentities((string)((isset($in['postId']) && is_array($in)) ?
$in['postId'] : null), ENT_QUOTES, 'UTF-8').'"
'.$sp.' >
@@ -289,7 +289,7 @@
);
return '<div class="flow-board">
-'.LCRun3::sec($cx, ((isset($in['roots']) && is_array($in)) ? $in['roots'] :
null), $in, true, function($cx, $in) {return ''.LCRun3::hbch($cx, 'eachPost',
array(array(((isset($cx['sp_vars']['root']) && is_array($cx['sp_vars'])) ?
$cx['sp_vars']['root'] : null),$in),array()), $in, false, function($cx, $in)
{return ''.LCRun3::p($cx, 'flow_moderate_topic', array(array($in),array()), '
').''.LCRun3::p($cx, 'flow_post',
array(array($in),array()), ' ').'';}).'';}).'</div>
+'.LCRun3::sec($cx, ((isset($in['roots']) && is_array($in)) ? $in['roots'] :
null), $in, true, function($cx, $in) {return ''.LCRun3::hbch($cx, 'eachPost',
array(array(((isset($cx['sp_vars']['root']) && is_array($cx['sp_vars'])) ?
$cx['sp_vars']['root'] : null),$in),array()), $in, false, function($cx, $in)
{return ''.LCRun3::p($cx, 'flow_moderate_topic', array(array($in),array()), '
').''.LCRun3::p($cx, 'flow_post_partial',
array(array($in),array()), ' ').'';}).'';}).'</div>
';
}
?>
\ No newline at end of file
diff --git a/handlebars/compiled/flow_post.handlebars.php
b/handlebars/compiled/flow_post.handlebars.php
index 6500f4e..e0ab323 100644
--- a/handlebars/compiled/flow_post.handlebars.php
+++ b/handlebars/compiled/flow_post.handlebars.php
@@ -249,23 +249,23 @@
'.$sp.''.LCRun3::sec($cx, ((isset($in['replies']) && is_array($in)) ?
$in['replies'] : null), $in, true, function($cx, $in)use($sp){return
''.LCRun3::hbch($cx, 'eachPost',
array(array(((isset($cx['sp_vars']['root']['rootBlock']) &&
is_array($cx['sp_vars']['root'])) ? $cx['sp_vars']['root']['rootBlock'] :
null),$in),array()), $in, false, function($cx, $in)use($sp){return '
<!-- eachPost nested replies -->
'.$sp.' '.LCRun3::ch($cx, 'post',
array(array(((isset($cx['sp_vars']['root']['rootBlock']) &&
is_array($cx['sp_vars']['root'])) ? $cx['sp_vars']['root']['rootBlock'] :
null),$in),array()), 'encq').'
'.$sp.'';}).'';}).''.LCRun3::hbch($cx, 'ifCond',
array(array(((isset($cx['sp_vars']['root']['rootBlock']['submitted']['postId'])
&& is_array($cx['sp_vars']['root']['rootBlock']['submitted'])) ?
$cx['sp_vars']['root']['rootBlock']['submitted']['postId'] :
null),'===',((isset($in['postId']) && is_array($in)) ? $in['postId'] :
null)),array()), $in, false, function($cx, $in)use($sp){return
''.LCRun3::hbch($cx, 'ifCond',
array(array(((isset($cx['sp_vars']['root']['rootBlock']['submitted']['action'])
&& is_array($cx['sp_vars']['root']['rootBlock']['submitted'])) ?
$cx['sp_vars']['root']['rootBlock']['submitted']['action'] :
null),'===','reply'),array()), $in, false, function($cx, $in)use($sp){return
''.LCRun3::p($cx, 'flow_reply_form', array(array($in),array()), '
').'';}).'';}).'</div>
-';},),
+';},'flow_post_partial' => function ($cx, $in, $sp) {return
''.$sp.''.LCRun3::wi($cx, ((isset($in['revision']) && is_array($in)) ?
$in['revision'] : null), $in, function($cx, $in)use($sp){return ' <div
id="flow-post-'.htmlentities((string)((isset($in['postId']) && is_array($in)) ?
$in['postId'] : null), ENT_QUOTES, 'UTF-8').'"
+'.$sp.' class="flow-post'.((LCRun3::ifvar($cx,
((isset($in['isMaxThreadingDepth']) && is_array($in)) ?
$in['isMaxThreadingDepth'] : null))) ? ' flow-post-max-depth' : '').'"
+'.$sp.'
data-flow-id="'.htmlentities((string)((isset($in['postId']) && is_array($in)) ?
$in['postId'] : null), ENT_QUOTES, 'UTF-8').'"
+'.$sp.' >
+'.$sp.''.((LCRun3::ifvar($cx, ((isset($in['isModerated']) && is_array($in)) ?
$in['isModerated'] : null))) ? ''.LCRun3::hbch($cx, 'ifCond',
array(array(((isset($cx['sp_vars']['root']['rootBlock']['submitted']['showPostId'])
&& is_array($cx['sp_vars']['root']['rootBlock']['submitted'])) ?
$cx['sp_vars']['root']['rootBlock']['submitted']['showPostId'] :
null),'===',((isset($in['postId']) && is_array($in)) ? $in['postId'] :
null)),array()), $in, false, function($cx, $in)use($sp){return
''.LCRun3::p($cx, 'flow_post_inner', array(array($in),array()), '
').'';}, function($cx, $in)use($sp){return '
<div class="flow-post-main flow-post-moderated">
+'.$sp.' <span
class="flow-moderated-post-content">
+'.$sp.''.LCRun3::p($cx, 'flow_post_moderation_state',
array(array($in),array()), ' ').'
</span>
+'.$sp.' </div>
+'.$sp.'';}).'' : ''.LCRun3::hbch($cx, 'ifCond',
array(array(((isset($cx['sp_vars']['root']['rootBlock']['submitted']['action'])
&& is_array($cx['sp_vars']['root']['rootBlock']['submitted'])) ?
$cx['sp_vars']['root']['rootBlock']['submitted']['action'] :
null),'===','edit-post'),array()), $in, false, function($cx,
$in)use($sp){return ''.LCRun3::hbch($cx, 'ifCond',
array(array(((isset($cx['sp_vars']['root']['rootBlock']['submitted']['postId'])
&& is_array($cx['sp_vars']['root']['rootBlock']['submitted'])) ?
$cx['sp_vars']['root']['rootBlock']['submitted']['postId'] :
null),'===',((isset($in['postId']) && is_array($in)) ? $in['postId'] :
null)),array()), $in, false, function($cx, $in)use($sp){return
''.LCRun3::p($cx, 'flow_edit_post', array(array($in),array()), '
').'';}, function($cx, $in)use($sp){return
''.LCRun3::p($cx, 'flow_post_inner', array(array($in),array()), '
').'';}).'';}, function($cx, $in)use($sp){return
''.LCRun3::p($cx, 'flow_post_inner', array(array($in),array()), '
').'';}).'').'
+'.$sp.''.LCRun3::p($cx, 'flow_post_replies', array(array($in),array()), '
').' </div>
+'.$sp.'';}).'';},),
'scopes' => array(),
'sp_vars' => array('root' => $in),
'lcrun' => 'LCRun3',
);
- return ''.LCRun3::wi($cx, ((isset($in['revision']) && is_array($in)) ?
$in['revision'] : null), $in, function($cx, $in) {return ' <div
id="flow-post-'.htmlentities((string)((isset($in['postId']) && is_array($in)) ?
$in['postId'] : null), ENT_QUOTES, 'UTF-8').'"
- class="flow-post'.((LCRun3::ifvar($cx,
((isset($in['isMaxThreadingDepth']) && is_array($in)) ?
$in['isMaxThreadingDepth'] : null))) ? ' flow-post-max-depth' : '').'"
- data-flow-id="'.htmlentities((string)((isset($in['postId']) &&
is_array($in)) ? $in['postId'] : null), ENT_QUOTES, 'UTF-8').'"
- >
-'.((LCRun3::ifvar($cx, ((isset($in['isModerated']) && is_array($in)) ?
$in['isModerated'] : null))) ? ''.LCRun3::hbch($cx, 'ifCond',
array(array(((isset($cx['sp_vars']['root']['rootBlock']['submitted']['showPostId'])
&& is_array($cx['sp_vars']['root']['rootBlock']['submitted'])) ?
$cx['sp_vars']['root']['rootBlock']['submitted']['showPostId'] :
null),'===',((isset($in['postId']) && is_array($in)) ? $in['postId'] :
null)),array()), $in, false, function($cx, $in) {return ''.LCRun3::p($cx,
'flow_post_inner', array(array($in),array()), '
').'';}, function($cx, $in) {return ' <div
class="flow-post-main flow-post-moderated">
- <span
class="flow-moderated-post-content">
-'.LCRun3::p($cx, 'flow_post_moderation_state', array(array($in),array()), '
').'
</span>
- </div>
-';}).'' : ''.LCRun3::hbch($cx, 'ifCond',
array(array(((isset($cx['sp_vars']['root']['rootBlock']['submitted']['action'])
&& is_array($cx['sp_vars']['root']['rootBlock']['submitted'])) ?
$cx['sp_vars']['root']['rootBlock']['submitted']['action'] :
null),'===','edit-post'),array()), $in, false, function($cx, $in) {return
''.LCRun3::hbch($cx, 'ifCond',
array(array(((isset($cx['sp_vars']['root']['rootBlock']['submitted']['postId'])
&& is_array($cx['sp_vars']['root']['rootBlock']['submitted'])) ?
$cx['sp_vars']['root']['rootBlock']['submitted']['postId'] :
null),'===',((isset($in['postId']) && is_array($in)) ? $in['postId'] :
null)),array()), $in, false, function($cx, $in) {return ''.LCRun3::p($cx,
'flow_edit_post', array(array($in),array()), '
').'';}, function($cx, $in) {return ''.LCRun3::p($cx, 'flow_post_inner',
array(array($in),array()), ' ').'';}).'';},
function($cx, $in) {return ''.LCRun3::p($cx, 'flow_post_inner',
array(array($in),array()), ' ').'';}).'').'
-'.LCRun3::p($cx, 'flow_post_replies', array(array($in),array()), '
').' </div>
-';}).'';
+ return ''.LCRun3::p($cx, 'flow_post_partial',
array(array($in),array())).'';
}
?>
\ No newline at end of file
diff --git a/handlebars/flow_block_topic_moderate_post.handlebars
b/handlebars/flow_block_topic_moderate_post.handlebars
index 0d63436..5c7f86b 100644
--- a/handlebars/flow_block_topic_moderate_post.handlebars
+++ b/handlebars/flow_block_topic_moderate_post.handlebars
@@ -3,7 +3,7 @@
{{#each roots}}
{{#eachPost @root this}}
{{> flow_moderate_post}}
- {{> flow_post}}
+ {{> flow_post_partial}}
{{/eachPost}}
{{/each}}
</div>
diff --git a/handlebars/flow_block_topic_moderate_topic.handlebars
b/handlebars/flow_block_topic_moderate_topic.handlebars
index 687e3d5..e2ebfc1 100644
--- a/handlebars/flow_block_topic_moderate_topic.handlebars
+++ b/handlebars/flow_block_topic_moderate_topic.handlebars
@@ -3,7 +3,7 @@
{{#each roots}}
{{#eachPost @root this}}
{{> flow_moderate_topic}}
- {{> flow_post}}
+ {{> flow_post_partial}}
{{/eachPost}}
{{/each}}
</div>
diff --git a/handlebars/flow_post.handlebars b/handlebars/flow_post.handlebars
deleted file mode 120000
index 7306d1f..0000000
--- a/handlebars/flow_post.handlebars
+++ /dev/null
@@ -1 +0,0 @@
-flow_post.partial.handlebars
\ No newline at end of file
diff --git a/handlebars/flow_post.handlebars b/handlebars/flow_post.handlebars
new file mode 100644
index 0000000..788779f
--- /dev/null
+++ b/handlebars/flow_post.handlebars
@@ -0,0 +1,3 @@
+{{!-- We used to use a symbolic link for this, but it was breaking for
+Windows and ExtensionDistributor users. --}}
+{{> flow_post_partial}}
\ No newline at end of file
diff --git a/handlebars/flow_post.partial.handlebars
b/handlebars/flow_post_partial.partial.handlebars
similarity index 100%
rename from handlebars/flow_post.partial.handlebars
rename to handlebars/flow_post_partial.partial.handlebars
--
To view, visit https://gerrit.wikimedia.org/r/295469
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4eed303a4b9c384ef6782e8e0bb281fff00ad5a9
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: REL1_26
Gerrit-Owner: Paladox <thomasmulhall...@yahoo.com>
Gerrit-Reviewer: Catrope <roan.katt...@gmail.com>
Gerrit-Reviewer: Esanders <esand...@wikimedia.org>
Gerrit-Reviewer: Jforrester <jforres...@wikimedia.org>
Gerrit-Reviewer: Legoktm <legoktm.wikipe...@gmail.com>
Gerrit-Reviewer: Mattflaschen <mflasc...@wikimedia.org>
Gerrit-Reviewer: Paladox <thomasmulhall...@yahoo.com>
Gerrit-Reviewer: Sbisson <sbis...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
