Skip to content

Commit

Permalink
[BUGFIX] Fix regression which was introduced with (#24)
Browse files Browse the repository at this point in the history
Move previously introduced importData argument "$beUserMatchGroupByTitle" to last position.
This fix is necessary to re-enable the file argument when importing data with e.g. table import
command.

Fixes: #26
  • Loading branch information
josefglatz authored Apr 10, 2018
1 parent 56677f4 commit 465d687
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions Classes/Command/ImportCommandController.php
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ class ImportCommandController extends AbstractCommandController
*/
public function backendUsersCommand($matchFields = 'username', $beUserMatchGroupByTitle = false, $file = null)
{
$this->importData('be_users', $matchFields, $beUserMatchGroupByTitle, $file);
$this->importData('be_users', $matchFields, $file, $beUserMatchGroupByTitle);
}

/**
Expand Down Expand Up @@ -116,11 +116,11 @@ public function tableCommand($table, $matchFields, $file = null)
*
* @param string $table
* @param string $matchFields Comma separated list of fields used to match configurations to database records.
* @param string $file Path to the yml file you wish to import. If none is given, all yml files in directories named 'Configuration' will be parsed
* @param bool $beUserMatchGroupByTitle Match be_group settings in be_users.usergroup by title or uid;
* if true be_groups.title is used. Default: **false**
* @param string $file Path to the yml file you wish to import. If none is given, all yml files in directories named 'Configuration' will be parsed
*/
protected function importData($table, $matchFields, $beUserMatchGroupByTitle = false, $file = null)
protected function importData($table, $matchFields, $file = null, $beUserMatchGroupByTitle = false)
{
$table = preg_replace('/[^a-z0-9_]/', '', $table);
$matchFields = explode(',', preg_replace('/[^a-z0-9_,]/', '', $matchFields));
Expand Down

0 comments on commit 465d687

Please sign in to comment.