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 "Add a method to HTMLForm that allows the preText to be accessed externally."
[lhc/web/wiklou.git]
/
includes
/
MediaWiki.php
diff --git
a/includes/MediaWiki.php
b/includes/MediaWiki.php
index
bcc3633
..
b11239a
100644
(file)
--- a/
includes/MediaWiki.php
+++ b/
includes/MediaWiki.php
@@
-568,7
+568,7
@@
class MediaWiki {
/**
* @see MediaWiki::preOutputCommit()
/**
* @see MediaWiki::preOutputCommit()
- * @param callable $postCommitWork [default: null]
+ * @param callable
|null
$postCommitWork [default: null]
* @since 1.26
*/
public function doPreOutputCommit( callable $postCommitWork = null ) {
* @since 1.26
*/
public function doPreOutputCommit( callable $postCommitWork = null ) {
@@
-580,7
+580,7
@@
class MediaWiki {
* the user can receive a response (in case commit fails)
*
* @param IContextSource $context
* the user can receive a response (in case commit fails)
*
* @param IContextSource $context
- * @param callable $postCommitWork [default: null]
+ * @param callable
|null
$postCommitWork [default: null]
* @since 1.27
*/
public static function preOutputCommit(
* @since 1.27
*/
public static function preOutputCommit(