mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-24 18:41:52 +02:00
Code Issues Releases Wiki Activity

Merge branch 'develop-ascraeus' into develop

Browse Source 
* develop-ascraeus:
  [ticket/11467] Add user object to extension manager for tests
  [ticket/11467] Add language variables to tests
  [ticket/11467] Add language variables for extension exception messages
This commit is contained in:
Joas Schilling
2014-05-30 23:01:57 +02:00
parent be8770532c 9f87c497fe
commit e8af120037
13 changed files with 62 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/includes/acp/acp_extensions.php
View File

@@ -70,7 +70,7 @@ class acp_extensions
// If they've specified an extension, let's load the metadata manager and validate it.
if ($ext_name)
{
$md_manager = new \phpbb\extension\metadata_manager($ext_name, $config, $phpbb_extension_manager, $template, $phpbb_root_path);
$md_manager = new \phpbb\extension\metadata_manager($ext_name, $config, $phpbb_extension_manager, $template, $user, $phpbb_root_path);
try
{

2
phpBB/includes/functions_admin.php
View File

@@ -3030,7 +3030,7 @@ function get_remote_file($host, $directory, $filename, &$errstr, &$errno, $port
}
else if (stripos($line, '404 not found') !== false)
{
$errstr = $user->lang('FILE_NOT_FOUND', $filename);
$errstr = $user->lang('FILE_NOT_FOUND', $filename);
return false;
}
}