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

[prep-release-3.2.0] Fix links to convertor

Browse source
This commit is contained in:
Marc Alexander 2017-01-07 16:16:24 +01:00
parent 9bbd034a4e
commit 830a384988
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
phpBB/install/convert/controller/convertor.php
View file

@ -253,11 +253,11 @@ class convertor
/** /**
* Obtain convertor settings * Obtain convertor settings
* *
* @param string $convertor Name of the convertor * @param string $converter Name of the convertor
* *
* @return \Symfony\Component\HttpFoundation\Response|StreamedResponse * @return \Symfony\Component\HttpFoundation\Response|StreamedResponse
*/ */
public function settings($convertor) public function settings($converter)
{ {
$this->setup_navigation('settings'); $this->setup_navigation('settings');
@ -265,7 +265,7 @@ class convertor
require_once ($this->phpbb_root_path . 'includes/functions_convert.' . $this->php_ext); require_once ($this->phpbb_root_path . 'includes/functions_convert.' . $this->php_ext);
// Include convertor if available // Include convertor if available
$convertor_file_path = $this->phpbb_root_path . 'install/convertors/convert_' . $convertor . '.' . $this->php_ext; $convertor_file_path = $this->phpbb_root_path . 'install/convertors/convert_' . $converter . '.' . $this->php_ext;
if (!file_exists($convertor_file_path)) if (!file_exists($convertor_file_path))
{ {
if ($this->request->is_ajax()) if ($this->request->is_ajax())
@ -313,8 +313,8 @@ class convertor
// It must be an AJAX request at this point // It must be an AJAX request at this point
$response = new StreamedResponse(); $response = new StreamedResponse();
$ref = $this; $ref = $this;
$response->setCallback(function() use ($ref, $convertor) { $response->setCallback(function() use ($ref, $converter) {
$ref->proccess_settings_form($convertor); $ref->proccess_settings_form($converter);
}); });
$response->headers->set('X-Accel-Buffering', 'no'); $response->headers->set('X-Accel-Buffering', 'no');
@ -324,7 +324,7 @@ class convertor
{ {
$this->template->assign_vars(array( $this->template->assign_vars(array(
'U_ACTION' => $this->controller_helper->route('phpbb_convert_settings', array( 'U_ACTION' => $this->controller_helper->route('phpbb_convert_settings', array(
'convertor' => $convertor, 'converter' => $converter,
)) ))
)); ));
@ -760,7 +760,7 @@ class convertor
'SOFTWARE' => $convertors[$index]['forum_name'], 'SOFTWARE' => $convertors[$index]['forum_name'],
'VERSION' => $convertors[$index]['version'], 'VERSION' => $convertors[$index]['version'],
'U_CONVERT' => $this->controller_helper->route('phpbb_convert_settings', array('convertor' => $convertors[$index]['tag'])), 'U_CONVERT' => $this->controller_helper->route('phpbb_convert_settings', array('converter' => $convertors[$index]['tag'])),
)); ));
} }