diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2014-03-12 16:25:01 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2014-03-12 16:25:01 +0100 |
| commit | d81a604ef853be782046d00a2f55160d8619b335 (patch) | |
| tree | 27bb454357fe87a467aac66c42c426ca8b6b32da | |
| parent | e65a6dd8f45d0ce4c8700fb68c19ac6268162aa0 (diff) | |
| parent | d95d062a4276504e1855d44aaddba2ff9bb974d6 (diff) | |
| download | forums-d81a604ef853be782046d00a2f55160d8619b335.tar forums-d81a604ef853be782046d00a2f55160d8619b335.tar.gz forums-d81a604ef853be782046d00a2f55160d8619b335.tar.bz2 forums-d81a604ef853be782046d00a2f55160d8619b335.tar.xz forums-d81a604ef853be782046d00a2f55160d8619b335.zip | |
Merge remote-tracking branch 'Crizz0/ticket/10549' into develop-olympus
* Crizz0/ticket/10549:
[ticket/10549] using correct variable in includes/functions_module.php too
[ticket/10549] changed "right" to "incorrect"
| -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 bb6913a572..0cc2425b28 100644 --- a/phpBB/includes/functions_module.php +++ b/phpBB/includes/functions_module.php @@ -450,7 +450,7 @@ class p_master if (!class_exists("{$this->p_class}_$this->p_name")) { - trigger_error($user->lang('MODULE_FILE_RIGHT_CLASS', "$module_path/{$this->p_class}_$this->p_name.$phpEx", "{$this->p_class}_$this->p_name"), E_USER_ERROR); + trigger_error($user->lang('MODULE_FILE_INCORRECT_CLASS', "$module_path/{$this->p_class}_$this->p_name.$phpEx", "{$this->p_class}_$this->p_name"), E_USER_ERROR); } if (!empty($mode)) diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index 663369b8fa..62c18c109c 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -343,7 +343,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', 'MSNM' => 'MSNM/WLM', |