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
Merge "RevisionStoreDbTestBase, remove redundant needsDB override"
[lhc/web/wiklou.git]
/
includes
/
actions
/
InfoAction.php
diff --git
a/includes/actions/InfoAction.php
b/includes/actions/InfoAction.php
index
e77cdf7
..
11b8bad
100644
(file)
--- a/
includes/actions/InfoAction.php
+++ b/
includes/actions/InfoAction.php
@@
-207,8
+207,6
@@
class InfoAction extends FormlessAction {
* @return array
*/
protected function pageInfo() {
* @return array
*/
protected function pageInfo() {
- global $wgContLang;
-
$services = MediaWikiServices::getInstance();
$user = $this->getUser();
$services = MediaWikiServices::getInstance();
$user = $this->getUser();
@@
-235,13
+233,14
@@
class InfoAction extends FormlessAction {
];
// Is it a redirect? If so, where to?
];
// Is it a redirect? If so, where to?
- if ( $title->isRedirect() ) {
+ $redirectTarget = $this->page->getRedirectTarget();
+ if ( $redirectTarget !== null ) {
$pageInfo['header-basic'][] = [
$this->msg( 'pageinfo-redirectsto' ),
$pageInfo['header-basic'][] = [
$this->msg( 'pageinfo-redirectsto' ),
- $linkRenderer->makeLink( $
this->page->getRedirectTarget()
) .
+ $linkRenderer->makeLink( $
redirectTarget
) .
$this->msg( 'word-separator' )->escaped() .
$this->msg( 'parentheses' )->rawParams( $linkRenderer->makeLink(
$this->msg( 'word-separator' )->escaped() .
$this->msg( 'parentheses' )->rawParams( $linkRenderer->makeLink(
- $
this->page->getRedirectTarget()
,
+ $
redirectTarget
,
$this->msg( 'pageinfo-redirectsto-info' )->text(),
[],
[ 'action' => 'info' ]
$this->msg( 'pageinfo-redirectsto-info' )->text(),
[],
[ 'action' => 'info' ]
@@
-607,7
+606,7
@@
class InfoAction extends FormlessAction {
$wordIDs = $magicWords->names;
// Array of IDs => localized magic words
$wordIDs = $magicWords->names;
// Array of IDs => localized magic words
- $localizedWords = $
wgContLang
->getMagicWords();
+ $localizedWords = $
services->getContentLanguage()
->getMagicWords();
$listItems = [];
foreach ( $pageProperties as $property => $value ) {
$listItems = [];
foreach ( $pageProperties as $property => $value ) {