diff options
| author | Tim Starling <tstarling@wikimedia.org> | 2016-01-29 16:19:58 +1100 |
|---|---|---|
| committer | Tim Starling <tstarling@wikimedia.org> | 2016-01-30 13:08:46 +1100 |
| commit | f43e0d840f8c9729e340b703868dc60b74336d5a (patch) | |
| tree | 0bb0d305e9b1f6a2ca2b7307b7af4591553e4f34 /languages/classes | |
| parent | 6a161cefbf3edb3099bbbfad9bd17fe8d9ada62e (diff) | |
| download | mediawikicore-f43e0d840f8c9729e340b703868dc60b74336d5a.tar.gz mediawikicore-f43e0d840f8c9729e340b703868dc60b74336d5a.zip | |
Use autoloader for PHP data files instead of include/require
Move ZhConversion.php and Names.php to languages/data and make them both
expose their data as static class variables instead of in the local
scope. This means that the autoloader can be used to load the data,
which is efficient and secure. This also makes additional request-local
caching of the arrays unnecessary.
Change-Id: Iafb96ac4165d0965fcb9a69f1d0a91139ea9790c
Diffstat (limited to 'languages/classes')
| -rw-r--r-- | languages/classes/LanguageGan.php | 5 | ||||
| -rw-r--r-- | languages/classes/LanguageZh.php | 17 |
2 files changed, 10 insertions, 12 deletions
diff --git a/languages/classes/LanguageGan.php b/languages/classes/LanguageGan.php index 8c8dfe0d1a1d..9dc3a866c96c 100644 --- a/languages/classes/LanguageGan.php +++ b/languages/classes/LanguageGan.php @@ -54,10 +54,9 @@ class GanConverter extends LanguageConverter { } function loadDefaultTables() { - require __DIR__ . '/../../includes/ZhConversion.php'; $this->mTables = array( - 'gan-hans' => new ReplacementArray( $zh2Hans ), - 'gan-hant' => new ReplacementArray( $zh2Hant ), + 'gan-hans' => new ReplacementArray( MediaWiki\Languages\Data\ZhConversion::$zh2Hans ), + 'gan-hant' => new ReplacementArray( MediaWiki\Languages\Data\ZhConversion::$zh2Hant ), 'gan' => new ReplacementArray ); } diff --git a/languages/classes/LanguageZh.php b/languages/classes/LanguageZh.php index 6e8860f3daba..51b09f694cf6 100644 --- a/languages/classes/LanguageZh.php +++ b/languages/classes/LanguageZh.php @@ -60,16 +60,15 @@ class ZhConverter extends LanguageConverter { } function loadDefaultTables() { - require __DIR__ . "/../../includes/ZhConversion.php"; $this->mTables = array( - 'zh-hans' => new ReplacementArray( $zh2Hans ), - 'zh-hant' => new ReplacementArray( $zh2Hant ), - 'zh-cn' => new ReplacementArray( $zh2CN ), - 'zh-hk' => new ReplacementArray( $zh2HK ), - 'zh-mo' => new ReplacementArray( $zh2HK ), - 'zh-my' => new ReplacementArray( $zh2CN ), - 'zh-sg' => new ReplacementArray( $zh2CN ), - 'zh-tw' => new ReplacementArray( $zh2TW ), + 'zh-hans' => new ReplacementArray( MediaWiki\Languages\Data\ZhConversion::$zh2Hans ), + 'zh-hant' => new ReplacementArray( MediaWiki\Languages\Data\ZhConversion::$zh2Hant ), + 'zh-cn' => new ReplacementArray( MediaWiki\Languages\Data\ZhConversion::$zh2CN ), + 'zh-hk' => new ReplacementArray( MediaWiki\Languages\Data\ZhConversion::$zh2HK ), + 'zh-mo' => new ReplacementArray( MediaWiki\Languages\Data\ZhConversion::$zh2HK ), + 'zh-my' => new ReplacementArray( MediaWiki\Languages\Data\ZhConversion::$zh2CN ), + 'zh-sg' => new ReplacementArray( MediaWiki\Languages\Data\ZhConversion::$zh2CN ), + 'zh-tw' => new ReplacementArray( MediaWiki\Languages\Data\ZhConversion::$zh2TW ), 'zh' => new ReplacementArray ); } |