makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-27 21:58:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/13844] Remove hacky code for the help array

Browse source 
PHPBB3-13844
This commit is contained in:
Joas Schilling 2015-05-17 21:18:17 +02:00
parent 80be642a0b
commit 8ce0a64a16
2 changed files with 4 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
phpBB/phpbb/language/language.php
View file

@ -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');

12
phpBB/phpbb/language/language_file_loader.php
View file

@ -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);
}
}
}