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 when viewing special pages with relative related titles
[lhc/web/wiklou.git]
/
includes
/
skins
/
Skin.php
diff --git
a/includes/skins/Skin.php
b/includes/skins/Skin.php
index
f45596f
..
bbad648
100644
(file)
--- a/
includes/skins/Skin.php
+++ b/
includes/skins/Skin.php
@@
-275,7
+275,7
@@
abstract class Skin extends ContextSource {
// Check, if the page can hold some kind of content, otherwise do nothing
$title = $this->getRelevantTitle();
// Check, if the page can hold some kind of content, otherwise do nothing
$title = $this->getRelevantTitle();
- if ( $title->canExist() ) {
+ if ( $title->canExist()
&& $title->canHaveTalkPage()
) {
if ( $title->isTalkPage() ) {
$titles[] = $title->getSubjectPage();
} else {
if ( $title->isTalkPage() ) {
$titles[] = $title->getSubjectPage();
} else {
@@
-389,9
+389,8
@@
abstract class Skin extends ContextSource {
/**
* Outputs the HTML generated by other functions.
/**
* Outputs the HTML generated by other functions.
- * @param OutputPage|null $out
*/
*/
- abstract function outputPage(
OutputPage $out = null
);
+ abstract function outputPage();
/**
* @param array $data
/**
* @param array $data
@@
-814,9
+813,11
@@
abstract class Skin extends ContextSource {
}
/**
}
/**
+ * @deprecated since 1.34, use getSearchLink() instead.
* @return string
*/
function escapeSearchLink() {
* @return string
*/
function escapeSearchLink() {
+ wfDeprecated( __METHOD__, '1.34' );
return htmlspecialchars( $this->getSearchLink() );
}
return htmlspecialchars( $this->getSearchLink() );
}