From cc1285a708afb6eb8d36251f9445667445a3e75a Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Mon, 28 Sep 2015 13:29:33 +0200 Subject: [PATCH] Fix 3 PHPCS warnings in includes/filerepo/ Change-Id: I00ea32f3a0666d225096d6c45710d0de67e2fe14 --- includes/filerepo/FileRepo.php | 2 -- includes/filerepo/file/LocalFile.php | 1 - 2 files changed, 3 deletions(-) diff --git a/includes/filerepo/FileRepo.php b/includes/filerepo/FileRepo.php index 7370c5cd4a..25e46d8d3e 100644 --- a/includes/filerepo/FileRepo.php +++ b/includes/filerepo/FileRepo.php @@ -753,7 +753,6 @@ class FileRepo { } if ( !is_null( $this->articleUrl ) ) { # "http://example.com/wiki/$1" - # # We use "Image:" as the canonical namespace for # compatibility across all MediaWiki versions. return str_replace( '$1', @@ -761,7 +760,6 @@ class FileRepo { } if ( !is_null( $this->scriptDirUrl ) ) { # "http://example.com/w" - # # We use "Image:" as the canonical namespace for # compatibility across all MediaWiki versions, # and just sort of hope index.php is right. ;) diff --git a/includes/filerepo/file/LocalFile.php b/includes/filerepo/file/LocalFile.php index 3225d78ef9..6745f186c0 100644 --- a/includes/filerepo/file/LocalFile.php +++ b/includes/filerepo/file/LocalFile.php @@ -2214,7 +2214,6 @@ class LocalFileDeleteBatch { // Lock the filearchive rows so that the files don't get deleted by a cleanup operation // We acquire this lock by running the inserts now, before the file operations. - // // This potentially has poor lock contention characteristics -- an alternative // scheme would be to insert stub filearchive entries with no fa_name and commit // them in a separate transaction, then run the file ops, then update the fa_name fields. -- 2.20.1