makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-11 22:08:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop-olympus' into develop

Browse source 
* 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
This commit is contained in:
Andreas Fischer 2014-03-12 16:28:47 +01:00
commit b809bea3d4
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/includes/functions_module.php
View file

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

2
phpBB/language/en/common.php
View file

@ -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',