Skip to content

Commit

Permalink
Merge pull request #202 from Toflar/patch-1
Browse files Browse the repository at this point in the history
Some PHP7 compat
  • Loading branch information
davidmaack committed Mar 29, 2016
2 parents f7da67e + 755c953 commit bc6d286
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions system/modules/multicolumnwizard/MultiColumnWizard.php
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ protected function validator($varInput)

try
{
$varValue = $this->$callback[0]->$callback[1]($varValue, $this);
$varValue = $this->{$callback[0]}->$callback[1]($varValue, $this);
}
catch (Exception $e)
{
Expand Down Expand Up @@ -382,7 +382,7 @@ public function generate()
foreach ($GLOBALS['TL_DCA'][$this->strTable]['fields'][$this->strField]['save_callback'] AS $callback)
{
$this->import($callback[0]);
$this->$callback[0]->$callback[1](serialize($this->varValue), $dc);
$this->{$callback[0]}->$callback[1](serialize($this->varValue), $dc);
}
}
else
Expand Down Expand Up @@ -618,7 +618,7 @@ public function generate()
foreach ($arrField['wizard'] as $callback)
{
$this->import($callback[0]);
$wizard .= $this->$callback[0]->$callback[1]($dc, $objWidget);
$wizard .= $this->{$callback[0]}->$callback[1]($dc, $objWidget);
}

$objWidget->wizard = $wizard;
Expand Down Expand Up @@ -891,7 +891,7 @@ protected function initializeWidget(&$arrField, $intRow, $strKey, $varValue)
$this->import($arrField['input_field_callback'][0]);
}

return $this->$arrField['input_field_callback'][0]->$arrField['input_field_callback'][1]($this, $xlabel);
return $this->{$arrField['input_field_callback'][0]}->$arrField['input_field_callback'][1]($this, $xlabel);
}

$strClass = $GLOBALS[(TL_MODE == 'BE' ? 'BE_FFL' : 'TL_FFL')][$arrField['inputType']];
Expand Down Expand Up @@ -943,7 +943,7 @@ protected function initializeWidget(&$arrField, $intRow, $strKey, $varValue)
foreach ($arrField['load_callback'] as $callback)
{
$this->import($callback[0]);
$varValue = $this->$callback[0]->$callback[1]($varValue, $this);
$varValue = $this->{$callback[0]}->$callback[1]($varValue, $this);
}
}

Expand Down

0 comments on commit bc6d286

Please sign in to comment.