Use content language for edit summary on upload overwrite
authorumherirrender <umherirrender_de.wp@web.de>
Sun, 28 Dec 2014 13:42:14 +0000 (14:42 +0100)
committerumherirrender <umherirrender_de.wp@web.de>
Sun, 28 Dec 2014 13:42:14 +0000 (14:42 +0100)
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

includes/filerepo/file/LocalFile.php

index eb0f654..94ef306 100644 (file)
@@ -1411,7 +1411,10 @@ class LocalFile extends File {
                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,