Make SettingsMigrationService run all migrations
This commit is contained in:
parent
e04ca3c4ae
commit
9b1d524bdc
@ -46,8 +46,12 @@ public final class SettingsMigrationService {
|
|||||||
configuration.set(ALLOWED_NICKNAME_CHARACTERS.getPath(), "[a-zA-Z0-9_]*");
|
configuration.set(ALLOWED_NICKNAME_CHARACTERS.getPath(), "[a-zA-Z0-9_]*");
|
||||||
changes = true;
|
changes = true;
|
||||||
}
|
}
|
||||||
changes = changes || performMailTextToFileMigration(configuration, pluginFolder)
|
|
||||||
|| migrateJoinLeaveMessages(configuration);
|
// Note ljacqu 20160211: Concatenating migration methods with | instead of the usual ||
|
||||||
|
// ensures that all migrations will be performed
|
||||||
|
changes = changes
|
||||||
|
| performMailTextToFileMigration(configuration, pluginFolder)
|
||||||
|
| migrateJoinLeaveMessages(configuration);
|
||||||
|
|
||||||
return changes;
|
return changes;
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user