Issue #2908571 by bojanz: ProfileSelect should validate that the defa…

…ult country is allowed
drupalcommerce · Sep 13, 2017 · 6e000f9 · 6e000f9
1 parent a3d594c
commit 6e000f9
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/modules/order/src/Element/ProfileSelect.php b/modules/order/src/Element/ProfileSelect.php
@@ -85,6 +85,12 @@ public static function processForm(array $element, FormStateInterface $form_stat
     if (!is_array($element['#available_countries'])) {
       throw new \InvalidArgumentException('The commerce_profile_select #available_countries property must be an array.');
     }
+    // Make sure that the specified default country is available.
+    if (!empty($element['#default_country']) && !empty($element['#available_countries'])) {
+      if (!in_array($element['#default_country'], $element['#available_countries'])) {
+        $element['#default_country'] = NULL;
+      }
+    }
 
     $element['#profile'] = $element['#default_value'];
     $form_display = EntityFormDisplay::collectRenderDisplay($element['#profile'], 'default');