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
Localisation updates from https://translatewiki.net.
[lhc/web/wiklou.git]
/
includes
/
OutputPage.php
diff --git
a/includes/OutputPage.php
b/includes/OutputPage.php
index
bf59c9a
..
50629ba
100644
(file)
--- a/
includes/OutputPage.php
+++ b/
includes/OutputPage.php
@@
-295,9
+295,6
@@
class OutputPage extends ContextSource {
*/
private $copyrightUrl;
*/
private $copyrightUrl;
- /** @var array Profiling data */
- private $limitReportData = [];
-
/**
* Constructor for OutputPage. This should not be called directly.
* Instead a new RequestContext should be created and it will implicitly create
/**
* Constructor for OutputPage. This should not be called directly.
* Instead a new RequestContext should be created and it will implicitly create
@@
-1214,8
+1211,8
@@
class OutputPage extends ContextSource {
/**
* Add new language links
*
/**
* Add new language links
*
- * @param
array $newLinkArray Associative array mapping language code to the page
- *
name
+ * @param
string[] $newLinkArray Array of interwiki-prefixed (non DB key) titles
+ *
(e.g. 'fr:Test page')
*/
public function addLanguageLinks( array $newLinkArray ) {
$this->mLanguageLinks += $newLinkArray;
*/
public function addLanguageLinks( array $newLinkArray ) {
$this->mLanguageLinks += $newLinkArray;
@@
-1224,8
+1221,8
@@
class OutputPage extends ContextSource {
/**
* Reset the language links and add new language links
*
/**
* Reset the language links and add new language links
*
- * @param
array $newLinkArray Associative array mapping language code to the page
- *
name
+ * @param
string[] $newLinkArray Array of interwiki-prefixed (non DB key) titles
+ *
(e.g. 'fr:Test page')
*/
public function setLanguageLinks( array $newLinkArray ) {
$this->mLanguageLinks = $newLinkArray;
*/
public function setLanguageLinks( array $newLinkArray ) {
$this->mLanguageLinks = $newLinkArray;
@@
-1234,7
+1231,7
@@
class OutputPage extends ContextSource {
/**
* Get the list of language links
*
/**
* Get the list of language links
*
- * @return
array Array of Interwiki Prefixed (non DB key) T
itles (e.g. 'fr:Test page')
+ * @return
string[] Array of interwiki-prefixed (non DB key) t
itles (e.g. 'fr:Test page')
*/
public function getLanguageLinks() {
return $this->mLanguageLinks;
*/
public function getLanguageLinks() {
return $this->mLanguageLinks;
@@
-1713,7
+1710,6
@@
class OutputPage extends ContextSource {
$popts->setTidy( $oldTidy );
$this->addParserOutput( $parserOutput );
$popts->setTidy( $oldTidy );
$this->addParserOutput( $parserOutput );
-
}
/**
}
/**
@@
-1776,16
+1772,11
@@
class OutputPage extends ContextSource {
}
}
}
}
- //
E
nable OOUI if requested via ParserOutput
+ //
e
nable OOUI if requested via ParserOutput
if ( $parserOutput->getEnableOOUI() ) {
$this->enableOOUI();
}
if ( $parserOutput->getEnableOOUI() ) {
$this->enableOOUI();
}
- // Include profiling data
- if ( !$this->limitReportData ) {
- $this->setLimitReportData( $parserOutput->getLimitReportData() );
- }
-
// Link flags are ignored for now, but may in the future be
// used to mark individual language links.
$linkFlags = [];
// Link flags are ignored for now, but may in the future be
// used to mark individual language links.
$linkFlags = [];
@@
-2811,8
+2802,8
@@
class OutputPage extends ContextSource {
// The spec recommends defining XHTML5's charset using the XML declaration
// instead of meta.
// Our XML declaration is output by Html::htmlHeader.
// The spec recommends defining XHTML5's charset using the XML declaration
// instead of meta.
// Our XML declaration is output by Html::htmlHeader.
- // http
://www.whatwg.org/html
/semantics.html#attr-meta-http-equiv-content-type
- // http
://www.whatwg.org/html
/semantics.html#charset
+ // http
s://html.spec.whatwg.org/multipage
/semantics.html#attr-meta-http-equiv-content-type
+ // http
s://html.spec.whatwg.org/multipage
/semantics.html#charset
$pieces[] = Html::element( 'meta', [ 'charset' => 'UTF-8' ] );
}
$pieces[] = Html::element( 'meta', [ 'charset' => 'UTF-8' ] );
}
@@
-2967,15
+2958,6
@@
class OutputPage extends ContextSource {
}
}
}
}
- if ( $this->limitReportData ) {
- $chunks[] = ResourceLoader::makeInlineScript(
- ResourceLoader::makeConfigSetScript(
- [ 'wgPageParseReport' => $this->limitReportData ],
- true
- )
- );
- }
-
return self::combineWrappedStrings( $chunks );
}
return self::combineWrappedStrings( $chunks );
}
@@
-3696,7
+3678,7
@@
class OutputPage extends ContextSource {
public static function transformCssMedia( $media ) {
global $wgRequest;
public static function transformCssMedia( $media ) {
global $wgRequest;
- // http://www.w3.org/TR/css3-mediaqueries/#syntax
+ // http
s
://www.w3.org/TR/css3-mediaqueries/#syntax
$screenMediaQueryRegex = '/^(?:only\s+)?screen\b/i';
// Switch in on-screen display for media testing
$screenMediaQueryRegex = '/^(?:only\s+)?screen\b/i';
// Switch in on-screen display for media testing
@@
-3877,12
+3859,4
@@
class OutputPage extends ContextSource {
'mediawiki.widgets.styles',
] );
}
'mediawiki.widgets.styles',
] );
}
-
- /**
- * @param array $data Data from ParserOutput::getLimitReportData()
- * @since 1.28
- */
- public function setLimitReportData( array $data ) {
- $this->limitReportData = $data;
- }
}
}