diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-05-30 23:01:57 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-05-30 23:01:57 +0200 |
| commit | e8af120037b0098f35b25a461d11c4977dae4582 (patch) | |
| tree | c8b13394ce875cc7e9fd912aff2af3647b86269e /phpBB/includes | |
| parent | be8770532c8bda7b5d73075705518ac1bb5d3d37 (diff) | |
| parent | 9f87c497fe25611ddd2f6963ce38b7edad876de3 (diff) | |
| download | forums-e8af120037b0098f35b25a461d11c4977dae4582.tar forums-e8af120037b0098f35b25a461d11c4977dae4582.tar.gz forums-e8af120037b0098f35b25a461d11c4977dae4582.tar.bz2 forums-e8af120037b0098f35b25a461d11c4977dae4582.tar.xz forums-e8af120037b0098f35b25a461d11c4977dae4582.zip | |
Merge branch 'develop-ascraeus' into develop
* 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
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/acp/acp_extensions.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/functions_admin.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/acp/acp_extensions.php b/phpBB/includes/acp/acp_extensions.php index 88b6a9c270..3d3cfb7f16 100644 --- a/phpBB/includes/acp/acp_extensions.php +++ b/phpBB/includes/acp/acp_extensions.php @@ -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 { diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php index 3000a18668..2d3ac62f86 100644 --- a/phpBB/includes/functions_admin.php +++ b/phpBB/includes/functions_admin.php @@ -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; } } |