Bsitu has uploaded a new change for review.
https://gerrit.wikimedia.org/r/160115
Change subject: @root.submitted may not exist in flow_reply_form
......................................................................
@root.submitted may not exist in flow_reply_form
For no-js version of flow-reply, templateHelper::post()
doesn't feed submitted key to the template, which causes
a warning.
Change-Id: Ibb2e643f795af2745a6abcd759608fc11a9d71b1
---
M handlebars/compiled/flow_block_topic.handlebars.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_block_topiclist.handlebars.php
M handlebars/compiled/flow_post.handlebars.php
M handlebars/flow_reply_form.handlebars
6 files changed, 12 insertions(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/15/160115/1
diff --git a/handlebars/compiled/flow_block_topic.handlebars.php
b/handlebars/compiled/flow_block_topic.handlebars.php
index 3066ab4..eb3dd80 100644
--- a/handlebars/compiled/flow_block_topic.handlebars.php
+++ b/handlebars/compiled/flow_block_topic.handlebars.php
@@ -345,7 +345,7 @@
class="mw-ui-input"
type="text"
placeholder="'.LCRun3::ch($cx, 'l10n',
Array(Array('flow-reply-topic-title-placeholder',LCRun3::ch($cx,
'plaintextSnippet', Array(Array(((is_array($in['content']) &&
isset($in['content']['format'])) ? $in['content']['format'] :
null),((is_array($in['content']) && isset($in['content']['content'])) ?
$in['content']['content'] : null)),Array()), 'raw')),Array()), 'encq').'"
- data-role="content">'.LCRun3::hbch($cx,
'ifCond', Array(Array(((is_array($cx['scopes'][0]['submitted']) &&
isset($cx['scopes'][0]['submitted']['postId'])) ?
$cx['scopes'][0]['submitted']['postId'] : null),'===',((is_array($in) &&
isset($in['postId'])) ? $in['postId'] : null)),Array()), $in, function($cx,
$in) {return ''.htmlentities(((is_array($cx['scopes'][0]['submitted']) &&
isset($cx['scopes'][0]['submitted']['content'])) ?
$cx['scopes'][0]['submitted']['content'] : null), ENT_QUOTES,
'UTF-8').'';}).'</textarea>
+ data-role="content">'.((LCRun3::ifvar($cx,
((is_array($cx['scopes'][0]) && isset($cx['scopes'][0]['submitted'])) ?
$cx['scopes'][0]['submitted'] : null))) ? ''.LCRun3::hbch($cx, 'ifCond',
Array(Array(((is_array($cx['scopes'][0]['submitted']) &&
isset($cx['scopes'][0]['submitted']['postId'])) ?
$cx['scopes'][0]['submitted']['postId'] : null),'===',((is_array($in) &&
isset($in['postId'])) ? $in['postId'] : null)),Array()), $in, function($cx,
$in) {return ''.htmlentities(((is_array($cx['scopes'][0]['submitted']) &&
isset($cx['scopes'][0]['submitted']['content'])) ?
$cx['scopes'][0]['submitted']['content'] : null), ENT_QUOTES, 'UTF-8').'';}).''
: '').'</textarea>
<div class="flow-form-actions flow-form-collapsible">
<button data-role="submit"
@@ -423,7 +423,7 @@
class="mw-ui-input"
type="text"
placeholder="'.LCRun3::ch($cx, 'l10n',
Array(Array('flow-reply-topic-title-placeholder',LCRun3::ch($cx,
'plaintextSnippet', Array(Array(((is_array($in['content']) &&
isset($in['content']['format'])) ? $in['content']['format'] :
null),((is_array($in['content']) && isset($in['content']['content'])) ?
$in['content']['content'] : null)),Array()), 'raw')),Array()), 'encq').'"
- data-role="content">'.LCRun3::hbch($cx,
'ifCond', Array(Array(((is_array($cx['scopes'][0]['submitted']) &&
isset($cx['scopes'][0]['submitted']['postId'])) ?
$cx['scopes'][0]['submitted']['postId'] : null),'===',((is_array($in) &&
isset($in['postId'])) ? $in['postId'] : null)),Array()), $in, function($cx,
$in) {return ''.htmlentities(((is_array($cx['scopes'][0]['submitted']) &&
isset($cx['scopes'][0]['submitted']['content'])) ?
$cx['scopes'][0]['submitted']['content'] : null), ENT_QUOTES,
'UTF-8').'';}).'</textarea>
+ data-role="content">'.((LCRun3::ifvar($cx,
((is_array($cx['scopes'][0]) && isset($cx['scopes'][0]['submitted'])) ?
$cx['scopes'][0]['submitted'] : null))) ? ''.LCRun3::hbch($cx, 'ifCond',
Array(Array(((is_array($cx['scopes'][0]['submitted']) &&
isset($cx['scopes'][0]['submitted']['postId'])) ?
$cx['scopes'][0]['submitted']['postId'] : null),'===',((is_array($in) &&
isset($in['postId'])) ? $in['postId'] : null)),Array()), $in, function($cx,
$in) {return ''.htmlentities(((is_array($cx['scopes'][0]['submitted']) &&
isset($cx['scopes'][0]['submitted']['content'])) ?
$cx['scopes'][0]['submitted']['content'] : null), ENT_QUOTES, 'UTF-8').'';}).''
: '').'</textarea>
<div class="flow-form-actions flow-form-collapsible">
<button data-role="submit"
diff --git a/handlebars/compiled/flow_block_topic_moderate_post.handlebars.php
b/handlebars/compiled/flow_block_topic_moderate_post.handlebars.php
index 02afa96..1e89d78 100644
--- a/handlebars/compiled/flow_block_topic_moderate_post.handlebars.php
+++ b/handlebars/compiled/flow_block_topic_moderate_post.handlebars.php
@@ -583,7 +583,7 @@
class="mw-ui-input"
type="text"
placeholder="'.LCRun3::ch($cx, 'l10n',
Array(Array('flow-reply-topic-title-placeholder',LCRun3::ch($cx,
'plaintextSnippet', Array(Array(((is_array($in['content']) &&
isset($in['content']['format'])) ? $in['content']['format'] :
null),((is_array($in['content']) && isset($in['content']['content'])) ?
$in['content']['content'] : null)),Array()), 'raw')),Array()), 'encq').'"
- data-role="content">'.LCRun3::hbch($cx,
'ifCond', Array(Array(((is_array($cx['scopes'][0]['submitted']) &&
isset($cx['scopes'][0]['submitted']['postId'])) ?
$cx['scopes'][0]['submitted']['postId'] : null),'===',((is_array($in) &&
isset($in['postId'])) ? $in['postId'] : null)),Array()), $in, function($cx,
$in) {return ''.htmlentities(((is_array($cx['scopes'][0]['submitted']) &&
isset($cx['scopes'][0]['submitted']['content'])) ?
$cx['scopes'][0]['submitted']['content'] : null), ENT_QUOTES,
'UTF-8').'';}).'</textarea>
+ data-role="content">'.((LCRun3::ifvar($cx,
((is_array($cx['scopes'][0]) && isset($cx['scopes'][0]['submitted'])) ?
$cx['scopes'][0]['submitted'] : null))) ? ''.LCRun3::hbch($cx, 'ifCond',
Array(Array(((is_array($cx['scopes'][0]['submitted']) &&
isset($cx['scopes'][0]['submitted']['postId'])) ?
$cx['scopes'][0]['submitted']['postId'] : null),'===',((is_array($in) &&
isset($in['postId'])) ? $in['postId'] : null)),Array()), $in, function($cx,
$in) {return ''.htmlentities(((is_array($cx['scopes'][0]['submitted']) &&
isset($cx['scopes'][0]['submitted']['content'])) ?
$cx['scopes'][0]['submitted']['content'] : null), ENT_QUOTES, 'UTF-8').'';}).''
: '').'</textarea>
<div class="flow-form-actions flow-form-collapsible">
<button data-role="submit"
diff --git a/handlebars/compiled/flow_block_topic_moderate_topic.handlebars.php
b/handlebars/compiled/flow_block_topic_moderate_topic.handlebars.php
index 2023d0f..36cd605 100644
--- a/handlebars/compiled/flow_block_topic_moderate_topic.handlebars.php
+++ b/handlebars/compiled/flow_block_topic_moderate_topic.handlebars.php
@@ -583,7 +583,7 @@
class="mw-ui-input"
type="text"
placeholder="'.LCRun3::ch($cx, 'l10n',
Array(Array('flow-reply-topic-title-placeholder',LCRun3::ch($cx,
'plaintextSnippet', Array(Array(((is_array($in['content']) &&
isset($in['content']['format'])) ? $in['content']['format'] :
null),((is_array($in['content']) && isset($in['content']['content'])) ?
$in['content']['content'] : null)),Array()), 'raw')),Array()), 'encq').'"
- data-role="content">'.LCRun3::hbch($cx,
'ifCond', Array(Array(((is_array($cx['scopes'][0]['submitted']) &&
isset($cx['scopes'][0]['submitted']['postId'])) ?
$cx['scopes'][0]['submitted']['postId'] : null),'===',((is_array($in) &&
isset($in['postId'])) ? $in['postId'] : null)),Array()), $in, function($cx,
$in) {return ''.htmlentities(((is_array($cx['scopes'][0]['submitted']) &&
isset($cx['scopes'][0]['submitted']['content'])) ?
$cx['scopes'][0]['submitted']['content'] : null), ENT_QUOTES,
'UTF-8').'';}).'</textarea>
+ data-role="content">'.((LCRun3::ifvar($cx,
((is_array($cx['scopes'][0]) && isset($cx['scopes'][0]['submitted'])) ?
$cx['scopes'][0]['submitted'] : null))) ? ''.LCRun3::hbch($cx, 'ifCond',
Array(Array(((is_array($cx['scopes'][0]['submitted']) &&
isset($cx['scopes'][0]['submitted']['postId'])) ?
$cx['scopes'][0]['submitted']['postId'] : null),'===',((is_array($in) &&
isset($in['postId'])) ? $in['postId'] : null)),Array()), $in, function($cx,
$in) {return ''.htmlentities(((is_array($cx['scopes'][0]['submitted']) &&
isset($cx['scopes'][0]['submitted']['content'])) ?
$cx['scopes'][0]['submitted']['content'] : null), ENT_QUOTES, 'UTF-8').'';}).''
: '').'</textarea>
<div class="flow-form-actions flow-form-collapsible">
<button data-role="submit"
diff --git a/handlebars/compiled/flow_block_topiclist.handlebars.php
b/handlebars/compiled/flow_block_topiclist.handlebars.php
index 0aa5393..9c79c2a 100644
--- a/handlebars/compiled/flow_block_topiclist.handlebars.php
+++ b/handlebars/compiled/flow_block_topiclist.handlebars.php
@@ -473,7 +473,7 @@
class="mw-ui-input"
type="text"
placeholder="'.LCRun3::ch($cx, 'l10n',
Array(Array('flow-reply-topic-title-placeholder',LCRun3::ch($cx,
'plaintextSnippet', Array(Array(((is_array($in['content']) &&
isset($in['content']['format'])) ? $in['content']['format'] :
null),((is_array($in['content']) && isset($in['content']['content'])) ?
$in['content']['content'] : null)),Array()), 'raw')),Array()), 'encq').'"
- data-role="content">'.LCRun3::hbch($cx,
'ifCond', Array(Array(((is_array($cx['scopes'][0]['submitted']) &&
isset($cx['scopes'][0]['submitted']['postId'])) ?
$cx['scopes'][0]['submitted']['postId'] : null),'===',((is_array($in) &&
isset($in['postId'])) ? $in['postId'] : null)),Array()), $in, function($cx,
$in) {return ''.htmlentities(((is_array($cx['scopes'][0]['submitted']) &&
isset($cx['scopes'][0]['submitted']['content'])) ?
$cx['scopes'][0]['submitted']['content'] : null), ENT_QUOTES,
'UTF-8').'';}).'</textarea>
+ data-role="content">'.((LCRun3::ifvar($cx,
((is_array($cx['scopes'][0]) && isset($cx['scopes'][0]['submitted'])) ?
$cx['scopes'][0]['submitted'] : null))) ? ''.LCRun3::hbch($cx, 'ifCond',
Array(Array(((is_array($cx['scopes'][0]['submitted']) &&
isset($cx['scopes'][0]['submitted']['postId'])) ?
$cx['scopes'][0]['submitted']['postId'] : null),'===',((is_array($in) &&
isset($in['postId'])) ? $in['postId'] : null)),Array()), $in, function($cx,
$in) {return ''.htmlentities(((is_array($cx['scopes'][0]['submitted']) &&
isset($cx['scopes'][0]['submitted']['content'])) ?
$cx['scopes'][0]['submitted']['content'] : null), ENT_QUOTES, 'UTF-8').'';}).''
: '').'</textarea>
<div class="flow-form-actions flow-form-collapsible">
<button data-role="submit"
@@ -551,7 +551,7 @@
class="mw-ui-input"
type="text"
placeholder="'.LCRun3::ch($cx, 'l10n',
Array(Array('flow-reply-topic-title-placeholder',LCRun3::ch($cx,
'plaintextSnippet', Array(Array(((is_array($in['content']) &&
isset($in['content']['format'])) ? $in['content']['format'] :
null),((is_array($in['content']) && isset($in['content']['content'])) ?
$in['content']['content'] : null)),Array()), 'raw')),Array()), 'encq').'"
- data-role="content">'.LCRun3::hbch($cx,
'ifCond', Array(Array(((is_array($cx['scopes'][0]['submitted']) &&
isset($cx['scopes'][0]['submitted']['postId'])) ?
$cx['scopes'][0]['submitted']['postId'] : null),'===',((is_array($in) &&
isset($in['postId'])) ? $in['postId'] : null)),Array()), $in, function($cx,
$in) {return ''.htmlentities(((is_array($cx['scopes'][0]['submitted']) &&
isset($cx['scopes'][0]['submitted']['content'])) ?
$cx['scopes'][0]['submitted']['content'] : null), ENT_QUOTES,
'UTF-8').'';}).'</textarea>
+ data-role="content">'.((LCRun3::ifvar($cx,
((is_array($cx['scopes'][0]) && isset($cx['scopes'][0]['submitted'])) ?
$cx['scopes'][0]['submitted'] : null))) ? ''.LCRun3::hbch($cx, 'ifCond',
Array(Array(((is_array($cx['scopes'][0]['submitted']) &&
isset($cx['scopes'][0]['submitted']['postId'])) ?
$cx['scopes'][0]['submitted']['postId'] : null),'===',((is_array($in) &&
isset($in['postId'])) ? $in['postId'] : null)),Array()), $in, function($cx,
$in) {return ''.htmlentities(((is_array($cx['scopes'][0]['submitted']) &&
isset($cx['scopes'][0]['submitted']['content'])) ?
$cx['scopes'][0]['submitted']['content'] : null), ENT_QUOTES, 'UTF-8').'';}).''
: '').'</textarea>
<div class="flow-form-actions flow-form-collapsible">
<button data-role="submit"
diff --git a/handlebars/compiled/flow_post.handlebars.php
b/handlebars/compiled/flow_post.handlebars.php
index c4d7a77..7557808 100644
--- a/handlebars/compiled/flow_post.handlebars.php
+++ b/handlebars/compiled/flow_post.handlebars.php
@@ -550,7 +550,7 @@
class="mw-ui-input"
type="text"
placeholder="'.LCRun3::ch($cx, 'l10n',
Array(Array('flow-reply-topic-title-placeholder',LCRun3::ch($cx,
'plaintextSnippet', Array(Array(((is_array($in['content']) &&
isset($in['content']['format'])) ? $in['content']['format'] :
null),((is_array($in['content']) && isset($in['content']['content'])) ?
$in['content']['content'] : null)),Array()), 'raw')),Array()), 'encq').'"
- data-role="content">'.LCRun3::hbch($cx,
'ifCond', Array(Array(((is_array($cx['scopes'][0]['submitted']) &&
isset($cx['scopes'][0]['submitted']['postId'])) ?
$cx['scopes'][0]['submitted']['postId'] : null),'===',((is_array($in) &&
isset($in['postId'])) ? $in['postId'] : null)),Array()), $in, function($cx,
$in) {return ''.htmlentities(((is_array($cx['scopes'][0]['submitted']) &&
isset($cx['scopes'][0]['submitted']['content'])) ?
$cx['scopes'][0]['submitted']['content'] : null), ENT_QUOTES,
'UTF-8').'';}).'</textarea>
+ data-role="content">'.((LCRun3::ifvar($cx,
((is_array($cx['scopes'][0]) && isset($cx['scopes'][0]['submitted'])) ?
$cx['scopes'][0]['submitted'] : null))) ? ''.LCRun3::hbch($cx, 'ifCond',
Array(Array(((is_array($cx['scopes'][0]['submitted']) &&
isset($cx['scopes'][0]['submitted']['postId'])) ?
$cx['scopes'][0]['submitted']['postId'] : null),'===',((is_array($in) &&
isset($in['postId'])) ? $in['postId'] : null)),Array()), $in, function($cx,
$in) {return ''.htmlentities(((is_array($cx['scopes'][0]['submitted']) &&
isset($cx['scopes'][0]['submitted']['content'])) ?
$cx['scopes'][0]['submitted']['content'] : null), ENT_QUOTES, 'UTF-8').'';}).''
: '').'</textarea>
<div class="flow-form-actions flow-form-collapsible">
<button data-role="submit"
diff --git a/handlebars/flow_reply_form.handlebars
b/handlebars/flow_reply_form.handlebars
index e963b5c..9be4162 100644
--- a/handlebars/flow_reply_form.handlebars
+++ b/handlebars/flow_reply_form.handlebars
@@ -22,9 +22,11 @@
type="text"
placeholder="{{l10n
"flow-reply-topic-title-placeholder" (plaintextSnippet content.format
content.content)}}"
data-role="content">
- {{~#ifCond @root.submitted.postId "===" postId~}}
- {{~@root.submitted.content~}}
- {{~/ifCond~}}
+ {{~#if @root.submitted~}}
+ {{~#ifCond @root.submitted.postId "==="
postId~}}
+ {{~@root.submitted.content~}}
+ {{~/ifCond~}}
+ {{~/if~}}
</textarea>
<div class="flow-form-actions flow-form-collapsible">
--
To view, visit https://gerrit.wikimedia.org/r/160115
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibb2e643f795af2745a6abcd759608fc11a9d71b1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Bsitu <bs...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
