Skip to content

Commit

Permalink
[prep-release-3.2.0] Fix links to convertor
Browse files Browse the repository at this point in the history
  • Loading branch information
marc1706 committed Jan 7, 2017
1 parent 9bbd034 commit 830a384
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions phpBB/install/convert/controller/convertor.php
Original file line number Diff line number Diff line change
Expand Up @@ -253,19 +253,19 @@ public function intro($start_new)
/**
* Obtain convertor settings
*
* @param string $convertor Name of the convertor
* @param string $converter Name of the convertor
*
* @return \Symfony\Component\HttpFoundation\Response|StreamedResponse
*/
public function settings($convertor)
public function settings($converter)
{
$this->setup_navigation('settings');

require_once ($this->phpbb_root_path . 'includes/constants.' . $this->php_ext);
require_once ($this->phpbb_root_path . 'includes/functions_convert.' . $this->php_ext);

// 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 ($this->request->is_ajax())
Expand Down Expand Up @@ -313,8 +313,8 @@ public function settings($convertor)
// It must be an AJAX request at this point
$response = new StreamedResponse();
$ref = $this;
$response->setCallback(function() use ($ref, $convertor) {
$ref->proccess_settings_form($convertor);
$response->setCallback(function() use ($ref, $converter) {
$ref->proccess_settings_form($converter);
});
$response->headers->set('X-Accel-Buffering', 'no');

Expand All @@ -324,7 +324,7 @@ public function settings($convertor)
{
$this->template->assign_vars(array(
'U_ACTION' => $this->controller_helper->route('phpbb_convert_settings', array(
'convertor' => $convertor,
'converter' => $converter,
))
));

Expand Down Expand Up @@ -760,7 +760,7 @@ protected function render_convert_list()
'SOFTWARE' => $convertors[$index]['forum_name'],
'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'])),
));
}

Expand Down

0 comments on commit 830a384

Please sign in to comment.