jenkins-bot has submitted this change and it was merged.
Change subject: Fatal error: Using $this when not in object context in
SpecialUpload.php on line 686
......................................................................
Fatal error: Using $this when not in object context in SpecialUpload.php on
line 686
Bug: 53065
Change-Id: I182e21e072974cb1478602bca70c8d9a31894cd6
---
M includes/specials/SpecialUpload.php
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Brian Wolff: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/specials/SpecialUpload.php
b/includes/specials/SpecialUpload.php
index 3a057ea..263ec3a 100644
--- a/includes/specials/SpecialUpload.php
+++ b/includes/specials/SpecialUpload.php
@@ -340,7 +340,7 @@
if ( $warning == 'exists' ) {
$msg = "\t<li>" . self::getExistsWarning( $args
) . "</li>\n";
} elseif ( $warning == 'duplicate' ) {
- $msg = self::getDupeWarning( $args );
+ $msg = $this->getDupeWarning( $args );
} elseif ( $warning == 'duplicate-archive' ) {
$msg = "\t<li>" . $this->msg(
'file-deleted-duplicate',
Title::makeTitle( NS_FILE,
$args )->getPrefixedText() )->parse()
@@ -677,7 +677,7 @@
* @param $dupes array
* @return string
*/
- public static function getDupeWarning( $dupes ) {
+ public function getDupeWarning( $dupes ) {
if ( !$dupes ) {
return '';
}
--
To view, visit https://gerrit.wikimedia.org/r/79850
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I182e21e072974cb1478602bca70c8d9a31894cd6
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Reedy <[email protected]>
Gerrit-Reviewer: Brian Wolff <[email protected]>
Gerrit-Reviewer: MarkTraceur <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
