Umherirrender has uploaded a new change for review.
https://gerrit.wikimedia.org/r/187133
Change subject: Use context when parsing message 'redirectedfrom'
......................................................................
Use context when parsing message 'redirectedfrom'
Avoids:
MessageCache::parse called [...] with no title set
Change-Id: Ib320da1081690bd21bdf9d0ef8d279c97fb42c9a
---
M includes/page/Article.php
1 file changed, 5 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/33/187133/1
diff --git a/includes/page/Article.php b/includes/page/Article.php
index 0fc251e..51654b9 100644
--- a/includes/page/Article.php
+++ b/includes/page/Article.php
@@ -960,9 +960,10 @@
*/
public function showRedirectedFromHeader() {
global $wgRedirectSources;
- $outputPage = $this->getContext()->getOutput();
- $request = $this->getContext()->getRequest();
+ $context = $this->getContext();
+ $outputPage = $context->getOutput();
+ $request = $context->getRequest();
$rdfrom = $request->getVal( 'rdfrom' );
// Construct a URL for the current page view, but with the
target title
@@ -987,7 +988,7 @@
);
$outputPage->addSubtitle( "<span
class=\"mw-redirectedfrom\">" .
- wfMessage( 'redirectedfrom'
)->rawParams( $redir )->parse()
+ $context->msg( 'redirectedfrom'
)->rawParams( $redir )->parse()
. "</span>" );
// Add the script to update the displayed URL
and
@@ -1011,7 +1012,7 @@
if ( $wgRedirectSources && preg_match(
$wgRedirectSources, $rdfrom ) ) {
$redir = Linker::makeExternalLink( $rdfrom,
$rdfrom );
$outputPage->addSubtitle( "<span
class=\"mw-redirectedfrom\">" .
- wfMessage( 'redirectedfrom'
)->rawParams( $redir )->parse()
+ $context->msg( 'redirectedfrom'
)->rawParams( $redir )->parse()
. "</span>" );
// Add the script to update the displayed URL
--
To view, visit https://gerrit.wikimedia.org/r/187133
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib320da1081690bd21bdf9d0ef8d279c97fb42c9a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Umherirrender <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
