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
resourceloader: Use upsert() instead of replace() for module_deps write
[lhc/web/wiklou.git]
/
includes
/
resourceloader
/
ResourceLoaderModule.php
diff --git
a/includes/resourceloader/ResourceLoaderModule.php
b/includes/resourceloader/ResourceLoaderModule.php
index
8124f33
..
fd74a82
100644
(file)
--- a/
includes/resourceloader/ResourceLoaderModule.php
+++ b/
includes/resourceloader/ResourceLoaderModule.php
@@
-476,14
+476,18
@@
abstract class ResourceLoaderModule implements LoggerAwareInterface {
}
$vary = $context->getSkin() . '|' . $context->getLanguage();
}
$vary = $context->getSkin() . '|' . $context->getLanguage();
+ // Use relative paths to avoid ghost entries when $IP changes (T111481)
+ $deps = FormatJson::encode( self::getRelativePaths( $localFileRefs ) );
$dbw = wfGetDB( DB_MASTER );
$dbw = wfGetDB( DB_MASTER );
- $dbw->replace( 'module_deps',
- [ [ 'md_module', 'md_skin' ] ],
+ $dbw->upsert( 'module_deps',
[
'md_module' => $this->getName(),
'md_skin' => $vary,
[
'md_module' => $this->getName(),
'md_skin' => $vary,
- // Use relative paths to avoid ghost entries when $IP changes (T111481)
- 'md_deps' => FormatJson::encode( self::getRelativePaths( $localFileRefs ) ),
+ 'md_deps' => $deps,
+ ],
+ [ 'md_module', 'md_skin' ],
+ [
+ 'md_deps' => $deps,
]
);
]
);