diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2014-03-12 16:28:47 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2014-03-12 16:28:47 +0100 |
| commit | b809bea3d4d56cd5cb2b9d3aa44f96c038ae807f (patch) | |
| tree | b3429111955ea81b159b47df0d4f8e5834b3d532 | |
| parent | ad6fda57764d2635741fc07f3db32fbe42057b72 (diff) | |
| parent | d81a604ef853be782046d00a2f55160d8619b335 (diff) | |
| download | forums-b809bea3d4d56cd5cb2b9d3aa44f96c038ae807f.tar forums-b809bea3d4d56cd5cb2b9d3aa44f96c038ae807f.tar.gz forums-b809bea3d4d56cd5cb2b9d3aa44f96c038ae807f.tar.bz2 forums-b809bea3d4d56cd5cb2b9d3aa44f96c038ae807f.tar.xz forums-b809bea3d4d56cd5cb2b9d3aa44f96c038ae807f.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/10549] using correct variable in includes/functions_module.php too
[ticket/10549] changed "right" to "incorrect"
Conflicts:
phpBB/includes/functions_module.php
| -rw-r--r-- | phpBB/includes/functions_module.php | 2 | ||||
| -rw-r--r-- | phpBB/language/en/common.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/functions_module.php b/phpBB/includes/functions_module.php index 28af7994c8..dca010518b 100644 --- a/phpBB/includes/functions_module.php +++ b/phpBB/includes/functions_module.php @@ -510,7 +510,7 @@ class p_master if (!class_exists($this->p_name)) { - trigger_error($user->lang('MODULE_FILE_RIGHT_CLASS', "$module_path/{$this->p_name}.$phpEx", $this->p_name), E_USER_ERROR); + trigger_error($user->lang('MODULE_FILE_INCORRECT_CLASS', "$module_path/{$this->p_name}.$phpEx", $this->p_name), E_USER_ERROR); } } diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index 1550271a3e..ed6525313f 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -404,7 +404,7 @@ $lang = array_merge($lang, array( 'MODERATORS' => 'Moderators', 'MODULE_NOT_ACCESS' => 'Module not accessible', 'MODULE_NOT_FIND' => 'Cannot find module %s', - 'MODULE_FILE_RIGHT_CLASS' => 'Module file %s does not contain correct class [%s]', + 'MODULE_FILE_INCORRECT_CLASS' => 'Module file %s does not contain correct class [%s]', 'MONTH' => 'Month', 'MOVE' => 'Move', |