Krinkle has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/337752 )
Change subject: resourceloader: Use upsert() instead of replace() for
module_deps write
......................................................................
resourceloader: Use upsert() instead of replace() for module_deps write
Change-Id: I1acfb0630946283b317cb929e8d7c3b2af757ecf
---
M includes/resourceloader/ResourceLoaderModule.php
1 file changed, 8 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/52/337752/1
diff --git a/includes/resourceloader/ResourceLoaderModule.php
b/includes/resourceloader/ResourceLoaderModule.php
index 8124f33..fd74a82 100644
--- a/includes/resourceloader/ResourceLoaderModule.php
+++ b/includes/resourceloader/ResourceLoaderModule.php
@@ -476,14 +476,18 @@
}
$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->replace( 'module_deps',
- [ [ 'md_module', 'md_skin' ] ],
+ $dbw->upsert( 'module_deps',
[
'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,
]
);
--
To view, visit https://gerrit.wikimedia.org/r/337752
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1acfb0630946283b317cb929e8d7c3b2af757ecf
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Krinkle <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
