Prevents multiple nationality from the same country (Closes #1097).

Signed-off-by: Stéphane Jacob <sj@m4x.org>

diff --git a/modules/profile/general.inc.php b/modules/profile/general.inc.php
index c0dcfa8..95bd977 100644 (file)
--- a/modules/profile/general.inc.php
+++ b/modules/profile/general.inc.php
@@ -542,10 +542,22 @@ class ProfileSettingGeneral extends ProfilePage
                 $this->values['nationality3'] = NULL;
             }
             if ($this->values['nationality1'] == "") {
-                $this->values['nationality1']  = $this->values['nationality2'];
+                $this->values['nationality1'] = $this->values['nationality2'];
                 $this->values['nationality2'] = $this->values['nationality3'];
                 $this->values['nationality3'] = NULL;
             }
+            if ($this->values['nationality1'] == $this->values['nationality2']
+                && $this->values['nationality2'] == $this->values['nationality3']) {
+                $this->values['nationality2'] = NULL;
+                $this->values['nationality3'] = NULL;
+            } else if ($this->values['nationality1'] == $this->values['nationality2']) {
+                $this->values['nationality2'] = $this->values['nationality3'];
+                $this->values['nationality3'] = NULL;
+            } else if ($this->values['nationality2'] == $this->values['nationality3']
+                    || $this->values['nationality1'] == $this->values['nationality3']) {
+                $this->values['nationality3'] = NULL;
+            }
+
             $new_email = ($this->values['email_directory'] == "new@example.org") ?
                 $this->values['email_directory_new'] : $this->values['email_directory'];
             if ($new_email == "") {