X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=includes%2Fskins%2FSkin.php;h=ed4045d4879ef14486ad87a3193bd8cf5d80bd83;hp=43b3ec1cad25b76ddf20ab62ebddb0ff7bf0cab3;hb=2323b0ba8161892714c3aba9fc6a4212397e0283;hpb=f5f625a4da35abcb4f578462efa8e9552eb2045d
diff --git a/includes/skins/Skin.php b/includes/skins/Skin.php
index 43b3ec1cad..ed4045d487 100644
--- a/includes/skins/Skin.php
+++ b/includes/skins/Skin.php
@@ -414,17 +414,13 @@ abstract class Skin extends ContextSource {
/**
* Get the query to generate a dynamic stylesheet
*
+ * @deprecated since 1.32 Use action=raw&ctype=text/css directly.
* @return array
*/
public static function getDynamicStylesheetQuery() {
- global $wgSquidMaxage;
-
return [
'action' => 'raw',
- 'maxage' => $wgSquidMaxage,
- 'usemsgcache' => 'yes',
'ctype' => 'text/css',
- 'smaxage' => $wgSquidMaxage,
];
}
@@ -503,6 +499,10 @@ abstract class Skin extends ContextSource {
/**
* Whether the logo should be preloaded with an HTTP link header or not
+ *
+ * @deprecated since 1.32 Redundant. It now happens automatically based on whether
+ * the skin loads a stylesheet based on ResourceLoaderSkinModule, which all
+ * skins that use wgLogo in CSS do, and other's would not.
* @since 1.29
* @return bool
*/
@@ -533,7 +533,7 @@ abstract class Skin extends ContextSource {
$t = $embed . implode( "{$pop}{$embed}", $allCats['normal'] ) . $pop;
$msg = $this->msg( 'pagecategories' )->numParams( count( $allCats['normal'] ) )->escaped();
- $linkPage = wfMessage( 'pagecategorieslink' )->inContentLanguage()->text();
+ $linkPage = $this->msg( 'pagecategorieslink' )->inContentLanguage()->text();
$title = Title::newFromText( $linkPage );
$link = $title ? Linker::link( $title, $msg ) : $msg;
$s .= '
' .
@@ -1331,7 +1331,7 @@ abstract class Skin extends ContextSource {
* @param string $message
*/
public function addToSidebar( &$bar, $message ) {
- $this->addToSidebarPlain( $bar, wfMessage( $message )->inContentLanguage()->plain() );
+ $this->addToSidebarPlain( $bar, $this->msg( $message )->inContentLanguage()->plain() );
}
/**
@@ -1472,7 +1472,7 @@ abstract class Skin extends ContextSource {
$uTalkTitle,
$this->msg( 'newmessageslinkplural' )->params( $plural )->escaped(),
[],
- [ 'redirect' => 'no' ]
+ $uTalkTitle->isRedirect() ? [ 'redirect' => 'no' ] : []
);
$newMessagesDiffLink = Linker::linkKnown(
@@ -1604,6 +1604,7 @@ abstract class Skin extends ContextSource {
/**
* Create a section edit link.
*
+ * @suppress SecurityCheck-XSS $links has keys of different taint types
* @param Title $nt The title being linked to (may not be the same as
* the current page, if the section is included from a template)
* @param string $section The designation of the section being pointed to,
@@ -1621,13 +1622,13 @@ abstract class Skin extends ContextSource {
$attribs = [];
if ( !is_null( $tooltip ) ) {
- $attribs['title'] = wfMessage( 'editsectionhint' )->rawParams( $tooltip )
+ $attribs['title'] = $this->msg( 'editsectionhint' )->rawParams( $tooltip )
->inLanguage( $lang )->text();
}
$links = [
'editsection' => [
- 'text' => wfMessage( 'editsection' )->inLanguage( $lang )->escaped(),
+ 'text' => $this->msg( 'editsection' )->inLanguage( $lang )->escaped(),
'targetTitle' => $nt,
'attribs' => $attribs,
'query' => [ 'action' => 'edit', 'section' => $section ],
@@ -1652,7 +1653,7 @@ abstract class Skin extends ContextSource {
$result .= implode(
''
- . wfMessage( 'pipe-separator' )->inLanguage( $lang )->escaped()
+ . $this->msg( 'pipe-separator' )->inLanguage( $lang )->escaped()
. '',
$linksHtml
);