dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix exception language in MovePage
[lhc/web/wiklou.git]
/
includes
/
OutputPage.php
diff --git
a/includes/OutputPage.php
b/includes/OutputPage.php
index
2423315
..
61a1ef2
100644
(file)
--- a/
includes/OutputPage.php
+++ b/
includes/OutputPage.php
@@
-2847,16
+2847,18
@@
class OutputPage extends ContextSource {
$query['returntoquery'] = wfArrayToCgi( $returntoquery );
}
}
$query['returntoquery'] = wfArrayToCgi( $returntoquery );
}
}
+ $title = SpecialPage::getTitleFor( 'Userlogin' );
$linkRenderer = MediaWikiServices::getInstance()->getLinkRenderer();
$linkRenderer = MediaWikiServices::getInstance()->getLinkRenderer();
+ $loginUrl = $title->getLinkURL( $query, false, PROTO_RELATIVE );
$loginLink = $linkRenderer->makeKnownLink(
$loginLink = $linkRenderer->makeKnownLink(
-
SpecialPage::getTitleFor( 'Userlogin' )
,
+
$title
,
$this->msg( 'loginreqlink' )->text(),
[],
$query
);
$this->prepareErrorPage( $this->msg( 'loginreqtitle' ) );
$this->msg( 'loginreqlink' )->text(),
[],
$query
);
$this->prepareErrorPage( $this->msg( 'loginreqtitle' ) );
- $this->addHTML( $this->msg( $msg )->rawParams( $loginLink )->parse() );
+ $this->addHTML( $this->msg( $msg )->rawParams( $loginLink )->par
ams( $loginUrl )->par
se() );
# Don't return to a page the user can't read otherwise
# we'll end up in a pointless loop
# Don't return to a page the user can't read otherwise
# we'll end up in a pointless loop
@@
-4132,12
+4134,12
@@
class OutputPage extends ContextSource {
*
* For example:
*
*
* For example:
*
- * $wgOut->wrapWikiMsg( "<div class='error'>\n$1\n</div>", 'some-error' );
+ *
$wgOut->wrapWikiMsg( "<div class='error'>\n$1\n</div>", 'some-error' );
*
* Is equivalent to:
*
*
* Is equivalent to:
*
- * $wgOut->addWikiTextAsInterface( "<div class='error'>\n"
- * . wfMessage( 'some-error' )->plain() . "\n</div>" );
+ *
$wgOut->addWikiTextAsInterface( "<div class='error'>\n"
+ *
. wfMessage( 'some-error' )->plain() . "\n</div>" );
*
* The newline after the opening div is needed in some wikitext. See T21226.
*
*
* The newline after the opening div is needed in some wikitext. See T21226.
*