X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2Ffilerepo%2FFileRepo.php;h=a67e3d6427354a242be8fa70bd51096d8ea33e58;hb=de6dab71e3ea0166095b6c6e3837255d1e56b887;hp=e430bc8f43b28ff9e334a3709c072b373fe9b95a;hpb=5155d0e0fd91f8ec614095e67ffe85e611190221;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/filerepo/FileRepo.php b/includes/filerepo/FileRepo.php
index e430bc8f43..a67e3d6427 100644
--- a/includes/filerepo/FileRepo.php
+++ b/includes/filerepo/FileRepo.php
@@ -78,10 +78,6 @@ class FileRepo {
 	 */
 	protected $scriptDirUrl;
 
-	/** @var string Script extension of the MediaWiki installation, equivalent
-	 *    to the old $wgScriptExtension, e.g. .php5 defaults to .php */
-	protected $scriptExtension;
-
 	/** @var string Equivalent to $wgArticlePath, e.g. https://en.wikipedia.org/wiki/$1 */
 	protected $articleUrl;
 
@@ -166,7 +162,7 @@ class FileRepo {
 		$optionalSettings = [
 			'descBaseUrl', 'scriptDirUrl', 'articleUrl', 'fetchDescription',
 			'thumbScriptUrl', 'pathDisclosureProtection', 'descriptionCacheExpiry',
-			'scriptExtension', 'favicon', 'thumbProxyUrl', 'thumbProxySecret'
+			'favicon', 'thumbProxyUrl', 'thumbProxySecret',
 		];
 		foreach ( $optionalSettings as $var ) {
 			if ( isset( $info[$var] ) ) {
@@ -744,9 +740,7 @@ class FileRepo {
 	 */
 	public function makeUrl( $query = '', $entry = 'index' ) {
 		if ( isset( $this->scriptDirUrl ) ) {
-			$ext = isset( $this->scriptExtension ) ? $this->scriptExtension : '.php';
-
-			return wfAppendQuery( "{$this->scriptDirUrl}/{$entry}{$ext}", $query );
+			return wfAppendQuery( "{$this->scriptDirUrl}/{$entry}.php", $query );
 		}
 
 		return false;
@@ -1928,7 +1922,7 @@ class FileRepo {
 
 		$optionalSettings = [
 			'url', 'thumbUrl', 'initialCapital', 'descBaseUrl', 'scriptDirUrl', 'articleUrl',
-			'fetchDescription', 'descriptionCacheExpiry', 'scriptExtension', 'favicon'
+			'fetchDescription', 'descriptionCacheExpiry', 'favicon'
 		];
 		foreach ( $optionalSettings as $k ) {
 			if ( isset( $this->$k ) ) {