From: Timo Tijhof <krinklemail@gmail.com>
Date: Sat, 9 May 2015 04:28:10 +0000 (+0100)
Subject: resourceloader: Use absolute file path in SpecialCharactersDataModule
X-Git-Tag: 1.31.0-rc.0~11458
X-Git-Url: http://git.cyclocoop.org/%22.htmlspecialchars%28%24url_syndic%29.%22?a=commitdiff_plain;h=281a1847d7fd408d277a3a65096fbda5ad03b92d;p=lhc%2Fweb%2Fwiklou.git

resourceloader: Use absolute file path in SpecialCharactersDataModule

Follows-up ec2330f.

When called, it fails fails:
> file_get_contents(resources/src/mediawiki.language/specialcharacters.json):
> failed to open stream: No such file or directory

Needs to be expanded relative to $IP, just like ResourceLoaderFileModule
and others do already.

Not previously caught by unit tests because this method was never
called from any tests.

Change-Id: Id87b3de29a61039d87b630202f1f71f112cbd752
---

diff --git a/includes/resourceloader/ResourceLoaderSpecialCharacterDataModule.php b/includes/resourceloader/ResourceLoaderSpecialCharacterDataModule.php
index 5c9170916f..bbc59aca69 100644
--- a/includes/resourceloader/ResourceLoaderSpecialCharacterDataModule.php
+++ b/includes/resourceloader/ResourceLoaderSpecialCharacterDataModule.php
@@ -35,7 +35,8 @@ class ResourceLoaderSpecialCharacterDataModule extends ResourceLoaderModule {
 	 * @return array
 	 */
 	protected function getData() {
-		return json_decode( file_get_contents( $this->path ) );
+		global $IP;
+		return json_decode( file_get_contents( "$IP/{$this->path}" ) );
 	}
 
 	/**