jenkins-bot has submitted this change and it was merged.
Change subject: Merge remote-tracking branch 'gerrit/master' into
frontend-rewrite
......................................................................
Merge remote-tracking branch 'gerrit/master' into frontend-rewrite
Change-Id: I8697e949cfe60a782f786e7178d5cc17edc1e72e
---
M i18n/en.json
M includes/Formatter/IRCLineUrlFormatter.php
2 files changed, 0 insertions(+), 12 deletions(-)
Approvals:
EBernhardson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/i18n/en.json b/i18n/en.json
index f7ab85f..e0358c7 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -300,12 +300,8 @@
"flow-toggle-topics-posts": "Toggle topics and posts view",
"flow-terms-of-use-summarize": "By clicking
\"{{int:flow-summarize-topic-submit}}\", you agree to the terms of use for this
wiki.",
"flow-terms-of-use-close-topic": "By clicking
\"{{int:flow-close-topic-submit}}\", you agree to the terms of use for this
wiki.",
-<<<<<<< HEAD (bf1fd4 Merge "Edit topic summary" into frontend-rewrite)
- "flow-terms-of-use-reopen-topic": "By clicking
\"{{int:flow-reopen-topic-submit}}\", you agree to the terms of use for this
wiki."
-=======
"flow-terms-of-use-reopen-topic": "By clicking
\"{{int:flow-reopen-topic-submit}}\", you agree to the terms of use for this
wiki.",
"flow-anon-warning": "You are not logged in. To receive attribution with
your name instead of your IP address, you can [$1 log in] or [$2 create an
account].",
"flow-whatlinkshere-post" : "from a [$1 post]",
"flow-whatlinkshere-header" : "from the [$1 header]"
->>>>>>> BRANCH (a001f4 Extract wiki and external links, file and template
usages fr)
}
diff --git a/includes/Formatter/IRCLineUrlFormatter.php
b/includes/Formatter/IRCLineUrlFormatter.php
index 3d5c4a1..267a10f 100644
--- a/includes/Formatter/IRCLineUrlFormatter.php
+++ b/includes/Formatter/IRCLineUrlFormatter.php
@@ -21,20 +21,12 @@
$encoded = $rc->getAttribute( 'rc_params' );
if ( !$encoded ) {
-<<<<<<< HEAD (bf1fd4 Merge "Edit topic summary" into frontend-rewrite)
- wfDebugLog( 'Flow', __METHOD__ . 'Something something'
);
-=======
wfDebugLog( 'Flow', __METHOD__ . 'Missing rc_params' );
->>>>>>> BRANCH (a001f4 Extract wiki and external links, file and template
usages fr)
return null;
}
$params = unserialize( $encoded );
if ( !isset( $params['flow-workflow-change'] ) ) {
-<<<<<<< HEAD (bf1fd4 Merge "Edit topic summary" into frontend-rewrite)
- wfDebugLog( 'Flow', __METHOD__ . 'Something something'
);
-=======
wfDebugLog( 'Flow', __METHOD__ . 'Missing
flow-workflow-change' );
->>>>>>> BRANCH (a001f4 Extract wiki and external links, file and template
usages fr)
return null;
}
$change = $params['flow-workflow-change'];
--
To view, visit https://gerrit.wikimedia.org/r/130865
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8697e949cfe60a782f786e7178d5cc17edc1e72e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: frontend-rewrite
Gerrit-Owner: EBernhardson <ebernhard...@wikimedia.org>
Gerrit-Reviewer: EBernhardson <ebernhard...@wikimedia.org>
Gerrit-Reviewer: Jdlrobson <jrob...@wikimedia.org>
Gerrit-Reviewer: Siebrand <siebr...@kitano.nl>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
