From: Alexandre Emsenhuber <ialex.wiki@gmail.com>
Date: Fri, 9 Nov 2012 15:02:37 +0000 (+0100)
Subject: Fix E_STRICT in ForeignAPIRepo
X-Git-Tag: 1.31.0-rc.0~21659^2
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22articles%22%2C%22id_article=%24ze_article%22%29%20.%20%22?a=commitdiff_plain;h=9a1855e931b76f1b7fe73f481de81535be817c8e;p=lhc%2Fweb%2Fwiklou.git

Fix E_STRICT in ForeignAPIRepo

The error is "Strict Standards:  Declaration of ForeignAPIRepo::getZoneUrl() should be compatible with that of FileRepo::getZoneUrl() in includes/filerepo/ForeignAPIRepo.php on line 426".
The second parameter of ForeignAPIRepo::getZoneUrl() was missing.

Change-Id: I8f60ff9d6152225ae99c1420d3a80c72c40974eb
---

diff --git a/includes/filerepo/ForeignAPIRepo.php b/includes/filerepo/ForeignAPIRepo.php
index 13de9e6b71..7697e4ea41 100644
--- a/includes/filerepo/ForeignAPIRepo.php
+++ b/includes/filerepo/ForeignAPIRepo.php
@@ -337,16 +337,17 @@ class ForeignAPIRepo extends FileRepo {
 	/**
 	 * @see FileRepo::getZoneUrl()
 	 * @param $zone String
+	 * @param $ext String|null Optional file extension
 	 * @return String
 	 */
-	function getZoneUrl( $zone ) {
+	function getZoneUrl( $zone, $ext = null ) {
 		switch ( $zone ) {
 			case 'public':
 				return $this->url;
 			case 'thumb':
 				return $this->thumbUrl;
 			default:
-				return parent::getZoneUrl( $zone );
+				return parent::getZoneUrl( $zone, $ext );
 		}
 	}