From: Aaron Schulz <aschulz@wikimedia.org>
Date: Fri, 2 May 2014 22:22:46 +0000 (-0700)
Subject: Removed unused getZoneHandlerUrl() method
X-Git-Tag: 1.31.0-rc.0~15886^2
X-Git-Url: https://git.cyclocoop.org/%7B%24admin_url%7Dmembres/%7B%7B%20url_for%28%27vote%27%2C%20idvote=vote.voteid%29%20%7D%7D?a=commitdiff_plain;h=f98ecde8343a8a5be20d17ca400204636378e336;p=lhc%2Fweb%2Fwiklou.git

Removed unused getZoneHandlerUrl() method

* This was not terribly well conceived and is not used by anything.

Change-Id: Icb03477e2b33621949fab7c39fd06e28ac0777fc
---

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 8c96727a8f..ccc761d69d 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -400,8 +400,6 @@ $wgImgAuthUrlPathMap = array();
  *                          url        : base URL to the root of the zone
  *                          urlsByExt  : map of file extension types to base URLs
  *                                       (useful for using a different cache for videos)
- *                          handlerUrl : base script-handled URL to the root of the zone
- *                                       (see FileRepo::getZoneHandlerUrl() function)
  *                      Zones default to using "<repo name>-<zone name>" as the container name
  *                      and default to using the container root as the zone's root directory.
  *                      Nesting of zone locations within other zones should be avoided.
diff --git a/includes/filerepo/FileRepo.php b/includes/filerepo/FileRepo.php
index 8701849ecf..26c274e839 100644
--- a/includes/filerepo/FileRepo.php
+++ b/includes/filerepo/FileRepo.php
@@ -295,29 +295,6 @@ class FileRepo {
 		}
 	}
 
-	/**
-	 * Get the thumb zone URL configured to be handled by scripts like thumb_handler.php.
-	 * This is probably only useful for internal requests, such as from a fast frontend server
-	 * to a slower backend server.
-	 *
-	 * Large sites may use a different host name for uploads than for wikis. In any case, the
-	 * wiki configuration is needed in order to use thumb.php. To avoid extracting the wiki ID
-	 * from the URL path, one can configure thumb_handler.php to recognize a special path on the
-	 * same host name as the wiki that is used for viewing thumbnails.
-	 *
-	 * @param string $zone One of: public, deleted, temp, thumb
-	 * @return string|bool String or false
-	 */
-	public function getZoneHandlerUrl( $zone ) {
-		if ( isset( $this->zones[$zone]['handlerUrl'] )
-			&& in_array( $zone, array( 'public', 'temp', 'thumb', 'transcoded' ) )
-		) {
-			return $this->zones[$zone]['handlerUrl'];
-		}
-
-		return false;
-	}
-
 	/**
 	 * Get the backend storage path corresponding to a virtual URL.
 	 * Use this function wisely.