diff options
| author | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-05-29 15:44:39 +0200 |
|---|---|---|
| committer | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-05-29 15:44:39 +0200 |
| commit | a3d46575c7f520dc9731ed4e9221c636c5c7c31e (patch) | |
| tree | aea13a869be9340728719cde8f5511a419a6f1f7 /phpBB/phpbb/language | |
| parent | f5dbc3b6f269cb3841c20ad0096fcedb3dac7492 (diff) | |
| parent | 077051fef56f0d9b504a2593dc84a3d05ef02e18 (diff) | |
| download | forums-a3d46575c7f520dc9731ed4e9221c636c5c7c31e.tar forums-a3d46575c7f520dc9731ed4e9221c636c5c7c31e.tar.gz forums-a3d46575c7f520dc9731ed4e9221c636c5c7c31e.tar.bz2 forums-a3d46575c7f520dc9731ed4e9221c636c5c7c31e.tar.xz forums-a3d46575c7f520dc9731ed4e9221c636c5c7c31e.zip | |
Merge pull request #3613 from nickvergessen/ticket/13844
Ticket/13844 Better FAQ language files
Diffstat (limited to 'phpBB/phpbb/language')
| -rw-r--r-- | phpBB/phpbb/language/language.php | 7 | ||||
| -rw-r--r-- | phpBB/phpbb/language/language_file_loader.php | 12 |
2 files changed, 4 insertions, 15 deletions
diff --git a/phpBB/phpbb/language/language.php b/phpBB/phpbb/language/language.php index 3298908365..b2b9f5ce12 100644 --- a/phpBB/phpbb/language/language.php +++ b/phpBB/phpbb/language/language.php @@ -83,10 +83,7 @@ class language // Set up default information $this->user_language = false; $this->default_language = false; - $this->lang = array( - // For BC with user::help array - '__help' => array(), - ); + $this->lang = array(); $this->loaded_language_sets = array( 'core' => array(), 'ext' => array(), @@ -155,8 +152,6 @@ class language /** * Add Language Items * - * Note: $use_help is assigned where needed (only use them to force inclusion). - * * Examples: * <code> * $component = array('posting'); diff --git a/phpBB/phpbb/language/language_file_loader.php b/phpBB/phpbb/language/language_file_loader.php index 510a29279a..9862cfc3aa 100644 --- a/phpBB/phpbb/language/language_file_loader.php +++ b/phpBB/phpbb/language/language_file_loader.php @@ -154,10 +154,12 @@ class language_file_loader * * @return string Relative path to language file * - * @throws \phpbb\language\exception\language_file_not_exists When the path to the file cannot be resolved + * @throws \phpbb\language\exception\language_file_not_found When the path to the file cannot be resolved */ protected function get_language_file_path($path, $filename, $locales) { + $language_file_path = $filename; + // Language fallback logic foreach ($locales as $locale) { @@ -191,9 +193,6 @@ class language_file_loader */ protected function load_language_file($path, &$lang) { - // BC code for language files with help - $help = array(); - // Do not suppress error if in DEBUG mode if (defined('DEBUG')) { @@ -203,10 +202,5 @@ class language_file_loader { @include $path; } - - if (!empty($help)) - { - $lang['__help'] = array_merge($lang['__help'], $help); - } } } |