use MediaWiki\Logger\LoggerFactory;
use MediaWiki\MediaWikiServices;
use MediaWiki\Session\SessionManager;
+use Wikimedia\Rdbms\IResultWrapper;
use Wikimedia\RelPath;
use Wikimedia\WrappedString;
use Wikimedia\WrappedStringList;
protected $mCanonicalUrl = false;
/**
- * @var string Should be private - has getter and setter. Contains
- * the HTML title */
- public $mPagetitle = '';
+ * @var string The contents of <h1> */
+ private $mPageTitle = '';
/**
* @var string Contains all of the "<body>" content. Should be private we
* Internal use only. Use OutputPage::addModules() if possible.
*
* @param string $file URL to file (absolute path, protocol-relative, or full url)
- * @param string $unused Previously used to change the cache-busting query parameter
+ * @param string|null $unused Previously used to change the cache-busting query parameter
*/
public function addScriptFile( $file, $unused = null ) {
if ( substr( $file, 0, 1 ) !== '/' && !preg_match( '#^[a-z]*://#i', $file ) ) {
# change "<script>foo&bar</script>" to "<script>foo&bar</script>"
# but leave "<i>foobar</i>" alone
$nameWithTags = Sanitizer::normalizeCharReferences( Sanitizer::removeHTMLtags( $name ) );
- $this->mPagetitle = $nameWithTags;
+ $this->mPageTitle = $nameWithTags;
# change "<i>foo&bar</i>" to "foo&bar"
$this->setHTMLTitle(
* @return string
*/
public function getPageTitle() {
- return $this->mPagetitle;
+ return $this->mPageTitle;
}
/**
* (e.g. 'fr:Test page')
*/
public function addLanguageLinks( array $newLinkArray ) {
- $this->mLanguageLinks += $newLinkArray;
+ $this->mLanguageLinks = array_merge( $this->mLanguageLinks, $newLinkArray );
}
/**
/**
* @param array $categories
- * @return bool|ResultWrapper
+ * @return bool|IResultWrapper
*/
protected function addCategoryLinksToLBAndGetResult( array $categories ) {
# Add the links to a LinkBatch
* @param ParserOutput $parserOutput
*/
public function addParserOutputMetadata( $parserOutput ) {
- $this->mLanguageLinks += $parserOutput->getLanguageLinks();
+ $this->mLanguageLinks =
+ array_merge( $this->mLanguageLinks, $parserOutput->getLanguageLinks() );
$this->addCategoryLinks( $parserOutput->getCategories() );
$this->setIndicators( $parserOutput->getIndicators() );
$this->mNewSectionLink = $parserOutput->getNewSection();
* @param bool $interface Use interface language ($wgLang instead of
* $wgContLang) while parsing language sensitive magic words like GRAMMAR and PLURAL.
* This also disables LanguageConverter.
- * @param Language $language Target language object, will override $interface
+ * @param Language|null $language Target language object, will override $interface
* @throws MWException
* @return string HTML
*/
* Output a standard permission error page
*
* @param array $errors Error message keys or [key, param...] arrays
- * @param string $action Action that was denied or null if unknown
+ * @param string|null $action Action that was denied or null if unknown
*/
public function showPermissionsErrorPage( array $errors, $action = null ) {
foreach ( $errors as $key => $error ) {
* Format a list of error messages
*
* @param array $errors Array of arrays returned by Title::getUserPermissionsErrors
- * @param string $action Action that was denied or null if unknown
+ * @param string|null $action Action that was denied or null if unknown
* @return string The wikitext error-messages, formatted into a list.
*/
public function formatPermissionsErrorMessage( array $errors, $action = null ) {
}
}
+ /**
+ * Output an error page
+ *
+ * @note FatalError exception class provides an alternative.
+ * @param string $message Error to output. Must be escaped for HTML.
+ */
public function showFatalError( $message ) {
$this->prepareErrorPage( $this->msg( 'internalerror' ) );
$this->addHTML( $message );
}
+ /**
+ * @deprecated 1.32 Use OutputPage::showFatalError or throw FatalError instead.
+ */
public function showUnexpectedValueError( $name, $val ) {
- $this->showFatalError( $this->msg( 'unexpected', $name, $val )->text() );
+ wfDeprecated( __METHOD__, '1.32' );
+ $this->showFatalError( $this->msg( 'unexpected', $name, $val )->escaped() );
}
+ /**
+ * @deprecated 1.32 Use OutputPage::showFatalError or throw FatalError instead.
+ */
public function showFileCopyError( $old, $new ) {
- $this->showFatalError( $this->msg( 'filecopyerror', $old, $new )->text() );
+ wfDeprecated( __METHOD__, '1.32' );
+ $this->showFatalError( $this->msg( 'filecopyerror', $old, $new )->escaped() );
}
+ /**
+ * @deprecated 1.32 Use OutputPage::showFatalError or throw FatalError instead.
+ */
public function showFileRenameError( $old, $new ) {
- $this->showFatalError( $this->msg( 'filerenameerror', $old, $new )->text() );
+ wfDeprecated( __METHOD__, '1.32' );
+ $this->showFatalError( $this->msg( 'filerenameerror', $old, $new )->escpaed() );
}
+ /**
+ * @deprecated 1.32 Use OutputPage::showFatalError or throw FatalError instead.
+ */
public function showFileDeleteError( $name ) {
- $this->showFatalError( $this->msg( 'filedeleteerror', $name )->text() );
+ wfDeprecated( __METHOD__, '1.32' );
+ $this->showFatalError( $this->msg( 'filedeleteerror', $name )->escaped() );
}
+ /**
+ * @deprecated 1.32 Use OutputPage::showFatalError or throw FatalError instead.
+ */
public function showFileNotFoundError( $name ) {
- $this->showFatalError( $this->msg( 'filenotfound', $name )->text() );
+ wfDeprecated( __METHOD__, '1.32' );
+ $this->showFatalError( $this->msg( 'filenotfound', $name )->escaped() );
}
/**
*
* @param Title $title Title to link
* @param array $query Query string parameters
- * @param string $text Text of the link (input is not escaped)
+ * @param string|null $text Text of the link (input is not escaped)
* @param array $options Options array to pass to Linker
*/
public function addReturnTo( $title, array $query = [], $text = null, $options = [] ) {
* Add a "return to" link pointing to a specified title,
* or the title indicated in the request, or else the main page
*
- * @param mixed $unused
- * @param Title|string $returnto Title or String to return to
- * @param string $returntoquery Query string for the return to link
+ * @param mixed|null $unused
+ * @param Title|string|null $returnto Title or String to return to
+ * @param string|null $returntoquery Query string for the return to link
*/
public function returnToMain( $unused = null, $returnto = null, $returntoquery = null ) {
if ( $returnto == null ) {
* Add one or more variables to be set in mw.config in JavaScript
*
* @param string|array $keys Key or array of key/value pairs
- * @param mixed $value [optional] Value of the configuration variable
+ * @param mixed|null $value [optional] Value of the configuration variable
*/
public function addJsConfigVars( $keys, $value = null ) {
if ( is_array( $keys ) ) {
] );
}
+ // Allow extensions to add, remove and/or otherwise manipulate these links
+ // If you want only to *add* <head> links, please use the addHeadItem()
+ // (or addHeadItems() for multiple items) method instead.
+ // This hook is provided as a last resort for extensions to modify these
+ // links before the output is sent to client.
+ Hooks::run( 'OutputPageAfterGetHeadLinksArray', [ &$tags, $this ] );
+
return $tags;
}
* @since 1.32
*/
public function getCSPNonce() {
- if ( !ContentSecurityPolicy::isEnabled( $this->getConfig() ) ) {
+ if ( !ContentSecurityPolicy::isNonceRequired( $this->getConfig() ) ) {
return false;
}
if ( $this->CSPNonce === null ) {
dépôts / lhc / web / wiklou.git / blobdiff