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 "Fix OutputPage::parseInternal() by stripping <div> wrapper"
[lhc/web/wiklou.git]
/
includes
/
Title.php
diff --git
a/includes/Title.php
b/includes/Title.php
index
5b0c3bc
..
51d8b13
100644
(file)
--- a/
includes/Title.php
+++ b/
includes/Title.php
@@
-2447,7
+2447,7
@@
class Title implements LinkTarget {
# XXX: this might be better using restrictions
if ( $action === 'patrol' ) {
# XXX: this might be better using restrictions
if ( $action === 'patrol' ) {
- return
[]
;
+ return
$errors
;
}
if ( preg_match( '/^' . preg_quote( $user->getName(), '/' ) . '\//', $this->mTextform ) ) {
}
if ( preg_match( '/^' . preg_quote( $user->getName(), '/' ) . '\//', $this->mTextform ) ) {
@@
-4846,8
+4846,9
@@
class Title implements LinkTarget {
$dbw = wfGetDB( DB_MASTER );
$dbw->onTransactionPreCommitOrIdle(
$dbw = wfGetDB( DB_MASTER );
$dbw->onTransactionPreCommitOrIdle(
- function () {
- ResourceLoaderWikiModule::invalidateModuleCache( $this, null, null, wfWikiID() );
+ function () use ( $dbw ) {
+ ResourceLoaderWikiModule::invalidateModuleCache(
+ $this, null, null, $dbw->getDomainId() );
},
__METHOD__
);
},
__METHOD__
);