jenkins-bot has submitted this change and it was merged.

Change subject: Use content language for edit summary on upload overwrite
......................................................................


Use content language for edit summary on upload overwrite

The edit summary for the null revision on upload overwrite was in the
user language and not in content language

Possible a regression from Idf281898d8a5a023a0b9ce3bc90b3ca55c1a6376

Bug: T72293
Change-Id: Ie70a3874e170b3849e91265e0c9c61da838f2d20
---
M includes/filerepo/file/LocalFile.php
1 file changed, 4 insertions(+), 1 deletion(-)

Approvals:
  Aaron Schulz: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/filerepo/file/LocalFile.php 
b/includes/filerepo/file/LocalFile.php
index eb0f654..94ef306 100644
--- a/includes/filerepo/file/LocalFile.php
+++ b/includes/filerepo/file/LocalFile.php
@@ -1411,7 +1411,10 @@
                if ( $exists ) {
                        # Create a null revision
                        $latest = $descTitle->getLatestRevID();
-                       $editSummary = LogFormatter::newFromEntry( $logEntry 
)->getPlainActionText();
+                       // Use own context to get the action text in content 
language
+                       $formatter = LogFormatter::newFromEntry( $logEntry );
+                       $formatter->setContext( 
RequestContext::newExtraneousContext( $descTitle ) );
+                       $editSummary = $formatter->getPlainActionText();
 
                        $nullRevision = Revision::newNullRevision(
                                $dbw,

-- 
To view, visit https://gerrit.wikimedia.org/r/181971
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie70a3874e170b3849e91265e0c9c61da838f2d20
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Umherirrender <umherirrender_de...@web.de>
Gerrit-Reviewer: Aaron Schulz <asch...@wikimedia.org>
Gerrit-Reviewer: Nikerabbit <niklas.laxst...@gmail.com>
Gerrit-Reviewer: Umherirrender <umherirrender_de...@web.de>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to