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 "Make addIdentifierQuotes part of IDatabase"
[lhc/web/wiklou.git]
/
includes
/
specialpage
/
SpecialPage.php
diff --git
a/includes/specialpage/SpecialPage.php
b/includes/specialpage/SpecialPage.php
index
7a39b3c
..
a9bbb8a
100644
(file)
--- a/
includes/specialpage/SpecialPage.php
+++ b/
includes/specialpage/SpecialPage.php
@@
-95,7
+95,8
@@
class SpecialPage implements MessageLocalizer {
* @return TitleValue
*/
public static function getTitleValueFor( $name, $subpage = false, $fragment = '' ) {
* @return TitleValue
*/
public static function getTitleValueFor( $name, $subpage = false, $fragment = '' ) {
- $name = SpecialPageFactory::getLocalNameFor( $name, $subpage );
+ $name = MediaWikiServices::getInstance()->getSpecialPageFactory()->
+ getLocalNameFor( $name, $subpage );
return new TitleValue( NS_SPECIAL, $name, $fragment );
}
return new TitleValue( NS_SPECIAL, $name, $fragment );
}
@@
-108,7
+109,8
@@
class SpecialPage implements MessageLocalizer {
* @return Title|null Title object or null if the page doesn't exist
*/
public static function getSafeTitleFor( $name, $subpage = false ) {
* @return Title|null Title object or null if the page doesn't exist
*/
public static function getSafeTitleFor( $name, $subpage = false ) {
- $name = SpecialPageFactory::getLocalNameFor( $name, $subpage );
+ $name = MediaWikiServices::getInstance()->getSpecialPageFactory()->
+ getLocalNameFor( $name, $subpage );
if ( $name ) {
return Title::makeTitleSafe( NS_SPECIAL, $name );
} else {
if ( $name ) {
return Title::makeTitleSafe( NS_SPECIAL, $name );
} else {
@@
-233,7
+235,8
@@
class SpecialPage implements MessageLocalizer {
*/
function getLocalName() {
if ( !isset( $this->mLocalName ) ) {
*/
function getLocalName() {
if ( !isset( $this->mLocalName ) ) {
- $this->mLocalName = SpecialPageFactory::getLocalNameFor( $this->mName );
+ $this->mLocalName = MediaWikiServices::getInstance()->getSpecialPageFactory()->
+ getLocalNameFor( $this->mName );
}
return $this->mLocalName;
}
return $this->mLocalName;
@@
-403,7
+406,7
@@
class SpecialPage implements MessageLocalizer {
if ( $securityStatus === AuthManager::SEC_OK ) {
$uniqueId = $request->getVal( 'postUniqueId' );
if ( $uniqueId ) {
if ( $securityStatus === AuthManager::SEC_OK ) {
$uniqueId = $request->getVal( 'postUniqueId' );
if ( $uniqueId ) {
- $key
= $key .
':' . $uniqueId;
+ $key
.=
':' . $uniqueId;
$session = $request->getSession();
$data = $session->getSecret( $key );
if ( $data ) {
$session = $request->getSession();
$data = $session->getSecret( $key );
if ( $data ) {
@@
-421,7
+424,7
@@
class SpecialPage implements MessageLocalizer {
if ( $data ) {
// unique ID in case the same special page is open in multiple browser tabs
$uniqueId = MWCryptRand::generateHex( 6 );
if ( $data ) {
// unique ID in case the same special page is open in multiple browser tabs
$uniqueId = MWCryptRand::generateHex( 6 );
- $key
= $key .
':' . $uniqueId;
+ $key
.=
':' . $uniqueId;
$queryParams['postUniqueId'] = $uniqueId;
$session = $request->getSession();
$session->persist(); // Just in case
$queryParams['postUniqueId'] = $uniqueId;
$session = $request->getSession();
$session->persist(); // Just in case
@@
-628,10
+631,9
@@
class SpecialPage implements MessageLocalizer {
* @param string $summaryMessageKey Message key of the summary
*/
function outputHeader( $summaryMessageKey = '' ) {
* @param string $summaryMessageKey Message key of the summary
*/
function outputHeader( $summaryMessageKey = '' ) {
- global $wgContLang;
-
if ( $summaryMessageKey == '' ) {
if ( $summaryMessageKey == '' ) {
- $msg = $wgContLang->lc( $this->getName() ) . '-summary';
+ $msg = MediaWikiServices::getInstance()->getContentLanguage()->lc( $this->getName() ) .
+ '-summary';
} else {
$msg = $summaryMessageKey;
}
} else {
$msg = $summaryMessageKey;
}
@@
-832,8
+834,9
@@
class SpecialPage implements MessageLocalizer {
return;
}
return;
}
- global $wgContLang;
- $msg = $this->msg( $wgContLang->lc( $this->getName() ) . '-helppage' );
+ $msg = $this->msg(
+ MediaWikiServices::getInstance()->getContentLanguage()->lc( $this->getName() ) .
+ '-helppage' );
if ( !$msg->isDisabled() ) {
$helpUrl = Skin::makeUrl( $msg->plain() );
if ( !$msg->isDisabled() ) {
$helpUrl = Skin::makeUrl( $msg->plain() );