From 969349e945062d2bed1f302daea5a01436237825 Mon Sep 17 00:00:00 2001 From: umherirrender Date: Wed, 7 May 2014 19:42:35 +0200 Subject: [PATCH] Fix declaration of ForeignDBFile::delete() Strict Standards: Declaration of ForeignDBFile::delete() should be compatible with that of LocalFile::delete() Followed-Up: I60cab27e0708a818c77791cc89194b6dd726da0b Change-Id: I11d32c0a529ec76978cde38c038b4984ca13e8ba --- includes/filerepo/file/File.php | 3 ++- includes/filerepo/file/ForeignDBFile.php | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/includes/filerepo/file/File.php b/includes/filerepo/file/File.php index a9af1e8033..5895ddad46 100644 --- a/includes/filerepo/file/File.php +++ b/includes/filerepo/file/File.php @@ -1652,11 +1652,12 @@ abstract class File { * * @param string $reason * @param bool $suppress Hide content from sysops? + * @param User|null $user * @return bool Boolean on success, false on some kind of failure * STUB * Overridden by LocalFile */ - function delete( $reason, $suppress = false ) { + function delete( $reason, $suppress = false, $user = null ) { $this->readOnlyError(); } diff --git a/includes/filerepo/file/ForeignDBFile.php b/includes/filerepo/file/ForeignDBFile.php index c5ff4a77fc..561ead755d 100644 --- a/includes/filerepo/file/ForeignDBFile.php +++ b/includes/filerepo/file/ForeignDBFile.php @@ -94,10 +94,11 @@ class ForeignDBFile extends LocalFile { /** * @param string $reason * @param bool $suppress + * @param User|null $user * @return FileRepoStatus * @throws MWException */ - function delete( $reason, $suppress = false ) { + function delete( $reason, $suppress = false, $user = null ) { $this->readOnlyError(); } -- 2.20.1