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 "Use {{int:}} on MediaWiki:Blockedtext and MediaWiki:Autoblockedtext"
[lhc/web/wiklou.git]
/
includes
/
parser
/
ParserOutput.php
diff --git
a/includes/parser/ParserOutput.php
b/includes/parser/ParserOutput.php
index
8f0a1d7
..
aa015a6
100644
(file)
--- a/
includes/parser/ParserOutput.php
+++ b/
includes/parser/ParserOutput.php
@@
-177,7
+177,7
@@
class ParserOutput extends CacheTime {
private $mIndexPolicy = '';
/**
private $mIndexPolicy = '';
/**
- * @var
array
$mAccessedOptions List of ParserOptions (stored in the keys).
+ * @var
true[]
$mAccessedOptions List of ParserOptions (stored in the keys).
*/
private $mAccessedOptions = [];
*/
private $mAccessedOptions = [];
@@
-685,9
+685,8
@@
class ParserOutput extends CacheTime {
/**
* Register a file dependency for this output
* @param string $name Title dbKey
/**
* Register a file dependency for this output
* @param string $name Title dbKey
- * @param string $timestamp MW timestamp of file creation (or false if non-existing)
- * @param string $sha1 Base 36 SHA-1 of file (or false if non-existing)
- * @return void
+ * @param string|false|null $timestamp MW timestamp of file creation (or false if non-existing)
+ * @param string|false|null $sha1 Base 36 SHA-1 of file (or false if non-existing)
*/
public function addImage( $name, $timestamp = null, $sha1 = null ) {
$this->mImages[$name] = 1;
*/
public function addImage( $name, $timestamp = null, $sha1 = null ) {
$this->mImages[$name] = 1;
@@
-701,7
+700,6
@@
class ParserOutput extends CacheTime {
* @param Title $title
* @param int $page_id
* @param int $rev_id
* @param Title $title
* @param int $page_id
* @param int $rev_id
- * @return void
*/
public function addTemplate( $title, $page_id, $rev_id ) {
$ns = $title->getNamespace();
*/
public function addTemplate( $title, $page_id, $rev_id ) {
$ns = $title->getNamespace();
@@
-746,14
+744,24
@@
class ParserOutput extends CacheTime {
}
}
}
}
+ /**
+ * @see OutputPage::addModules
+ */
public function addModules( $modules ) {
$this->mModules = array_merge( $this->mModules, (array)$modules );
}
public function addModules( $modules ) {
$this->mModules = array_merge( $this->mModules, (array)$modules );
}
+ /**
+ * @deprecated since 1.31 Use addModules() instead.
+ * @see OutputPage::addModuleScripts
+ */
public function addModuleScripts( $modules ) {
$this->mModuleScripts = array_merge( $this->mModuleScripts, (array)$modules );
}
public function addModuleScripts( $modules ) {
$this->mModuleScripts = array_merge( $this->mModuleScripts, (array)$modules );
}
+ /**
+ * @see OutputPage::addModuleStyles
+ */
public function addModuleStyles( $modules ) {
$this->mModuleStyles = array_merge( $this->mModuleStyles, (array)$modules );
}
public function addModuleStyles( $modules ) {
$this->mModuleStyles = array_merge( $this->mModuleStyles, (array)$modules );
}
@@
-968,8
+976,8
@@
class ParserOutput extends CacheTime {
/**
* Returns the options from its ParserOptions which have been taken
/**
* Returns the options from its ParserOptions which have been taken
- * into account to produce this output
or false if not available
.
- * @return
array
+ * into account to produce this output.
+ * @return
string[]
*/
public function getUsedOptions() {
if ( !isset( $this->mAccessedOptions ) ) {
*/
public function getUsedOptions() {
if ( !isset( $this->mAccessedOptions ) ) {