From: umherirrender <umherirrender_de.wp@web.de>
Date: Wed, 7 May 2014 17:42:35 +0000 (+0200)
Subject: Fix declaration of ForeignDBFile::delete()
X-Git-Tag: 1.31.0-rc.0~15844^2
X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/comptes/ajouter.php?a=commitdiff_plain;h=969349e945062d2bed1f302daea5a01436237825;p=lhc%2Fweb%2Fwiklou.git

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
---

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();
 	}