From 9b1d524bdce01f3f0cb4e123bd1d1d96e65bdb29 Mon Sep 17 00:00:00 2001
From: ljacqu <ljacqu@users.noreply.github.com>
Date: Thu, 11 Feb 2016 22:21:06 +0100
Subject: [PATCH] Make SettingsMigrationService run all migrations

---
 .../xephi/authme/settings/SettingsMigrationService.java   | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main/java/fr/xephi/authme/settings/SettingsMigrationService.java b/src/main/java/fr/xephi/authme/settings/SettingsMigrationService.java
index 5bb15690..e93fd18c 100644
--- a/src/main/java/fr/xephi/authme/settings/SettingsMigrationService.java
+++ b/src/main/java/fr/xephi/authme/settings/SettingsMigrationService.java
@@ -46,8 +46,12 @@ public final class SettingsMigrationService {
             configuration.set(ALLOWED_NICKNAME_CHARACTERS.getPath(), "[a-zA-Z0-9_]*");
             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;
     }