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 "Fix ParserOutput::getText 'unwrap' flag for end-of-doc comment"
[lhc/web/wiklou.git]
/
includes
/
skins
/
Skin.php
diff --git
a/includes/skins/Skin.php
b/includes/skins/Skin.php
index
07964a4
..
bd43255
100644
(file)
--- a/
includes/skins/Skin.php
+++ b/
includes/skins/Skin.php
@@
-767,15
+767,6
@@
abstract class Skin extends ContextSource {
return $subpages;
}
return $subpages;
}
- /**
- * @deprecated since 1.27, feature removed
- * @return bool Always false
- */
- function showIPinHeader() {
- wfDeprecated( __METHOD__, '1.27' );
- return false;
- }
-
/**
* @return string
*/
/**
* @return string
*/
@@
-911,7
+902,7
@@
abstract class Skin extends ContextSource {
$s = '';
}
$s = '';
}
- if (
wfGetLB
()->getLaggedReplicaMode() ) {
+ if (
MediaWikiServices::getInstance()->getDBLoadBalancer
()->getLaggedReplicaMode() ) {
$s .= ' <strong>' . $this->msg( 'laggedslavemode' )->parse() . '</strong>';
}
$s .= ' <strong>' . $this->msg( 'laggedslavemode' )->parse() . '</strong>';
}