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 "ChangesListSpecialPage: Add urlversion and make urlversion=2 ignore defaults"
[lhc/web/wiklou.git]
/
includes
/
specialpage
/
SpecialPage.php
diff --git
a/includes/specialpage/SpecialPage.php
b/includes/specialpage/SpecialPage.php
index
00d8c4a
..
9594952
100644
(file)
--- a/
includes/specialpage/SpecialPage.php
+++ b/
includes/specialpage/SpecialPage.php
@@
-33,7
+33,7
@@
use MediaWiki\MediaWikiServices;
*
* @ingroup SpecialPage
*/
*
* @ingroup SpecialPage
*/
-class SpecialPage {
+class SpecialPage
implements MessageLocalizer
{
// The canonical name of this special page
// Also used for the default <h1> heading, @see getDescription()
protected $mName;
// The canonical name of this special page
// Also used for the default <h1> heading, @see getDescription()
protected $mName;
@@
-743,7
+743,7
@@
class SpecialPage {
* @return Message
* @see wfMessage
*/
* @return Message
* @see wfMessage
*/
- public function msg( /* $args */ ) {
+ public function msg(
$key
/* $args */ ) {
$message = call_user_func_array(
[ $this->getContext(), 'msg' ],
func_get_args()
$message = call_user_func_array(
[ $this->getContext(), 'msg' ],
func_get_args()
@@
-783,6
+783,10
@@
class SpecialPage {
* @since 1.25
*/
public function addHelpLink( $to, $overrideBaseUrl = false ) {
* @since 1.25
*/
public function addHelpLink( $to, $overrideBaseUrl = false ) {
+ if ( $this->including() ) {
+ return;
+ }
+
global $wgContLang;
$msg = $this->msg( $wgContLang->lc( $this->getName() ) . '-helppage' );
global $wgContLang;
$msg = $this->msg( $wgContLang->lc( $this->getName() ) . '-helppage' );
@@
-853,7
+857,7
@@
class SpecialPage {
* @since 1.28
* @return \MediaWiki\Linker\LinkRenderer
*/
* @since 1.28
* @return \MediaWiki\Linker\LinkRenderer
*/
- p
rotected
function getLinkRenderer() {
+ p
ublic
function getLinkRenderer() {
if ( $this->linkRenderer ) {
return $this->linkRenderer;
} else {
if ( $this->linkRenderer ) {
return $this->linkRenderer;
} else {