Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/229628
Change subject: resourceloader: Fix undefined $filename in safeFileHash()
......................................................................
resourceloader: Fix undefined $filename in safeFileHash()
Follows-up 28f6d7fbdee.
This was causing versions to stay stuck at their current version.
It worked fine for the initial deployment since the rest of the
definition summary is still fine, but subsequent deploys that changed
only the file were ineffective due to these silently becoming
empty strings.
Thanks to suppressWarnings() we never saw these anywhere in the
tests or in production.
Change-Id: Ib4371255fe970442bcc0041219bce633a7f6f6dd
---
M includes/resourceloader/ResourceLoaderModule.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/28/229628/1
diff --git a/includes/resourceloader/ResourceLoaderModule.php
b/includes/resourceloader/ResourceLoaderModule.php
index 8e53c3e..ade99e2 100644
--- a/includes/resourceloader/ResourceLoaderModule.php
+++ b/includes/resourceloader/ResourceLoaderModule.php
@@ -857,7 +857,7 @@
*/
protected static function safeFileHash( $filePath ) {
MediaWiki\suppressWarnings();
- $hash = sha1_file( $filename ) ?: '';
+ $hash = sha1_file( $filePath ) ?: '';
MediaWiki\restoreWarnings();
return $hash;
}
--
To view, visit https://gerrit.wikimedia.org/r/229628
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib4371255fe970442bcc0041219bce633a7f6f6dd
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
