From 82c3af51fea5e9da6f720c5b277236c1e635a50b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20Knippers?= <daniel.knippers@perplex.nl>
Date: Fri, 23 Aug 2019 13:19:33 +0200
Subject: [PATCH] Fixes writing / reading segment data combined with segment
 null

---
 .../ContentVariationExtensions.cs             | 57 ++++++++++---------
 .../Compose/NotificationsComponent.cs         |  3 -
 2 files changed, 31 insertions(+), 29 deletions(-)

diff --git a/src/Umbraco.Core/ContentVariationExtensions.cs b/src/Umbraco.Core/ContentVariationExtensions.cs
index 9fdc5f0b90..2c838eecbc 100644
--- a/src/Umbraco.Core/ContentVariationExtensions.cs
+++ b/src/Umbraco.Core/ContentVariationExtensions.cs
@@ -150,39 +150,44 @@ namespace Umbraco.Core
             culture = culture.NullOrWhiteSpaceAsNull();
             segment = segment.NullOrWhiteSpaceAsNull();
 
-            bool Validate(bool variesBy, string value)
-            {
-                if (variesBy)
-                {
-                    // varies by
-                    // in exact mode, the value cannot be null (but it can be a wildcard)
-                    // in !wildcards mode, the value cannot be a wildcard (but it can be null)
-                    if ((exact && value == null) || (!wildcards && value == "*"))
-                        return false;
-                }
-                else
-                {
-                    // does not vary by value
-                    // the value cannot have a value
-                    // unless wildcards and it's "*"
-                    if (value != null && (!wildcards || value != "*"))
-                        return false;
-                }
-
-                return true;
-            }
-
-            if (!Validate(variation.VariesByCulture(), culture))
+            // if wildcards are disabled, do not allow "*"
+            if (!wildcards && (culture == "*" || segment == "*"))
             {
                 if (throwIfInvalid)
-                    throw new NotSupportedException($"Culture value \"{culture ?? "<null>"}\" is invalid.");
+                    throw new NotSupportedException($"Variation wildcards are not supported.");
                 return false;
             }
 
-            if (!Validate(variation.VariesBySegment(), segment))
+            if (variation.VariesByCulture())
+            {
+                // varies by culture
+                // in exact mode, the culture cannot be null                
+                if (exact && culture == null)
+                {
+                    if (throwIfInvalid)
+                        throw new NotSupportedException($"Culture may not be null because culture variation is enabled.");
+                    return false;
+                }    
+            }
+            else
+            {
+                // does not vary by culture
+                // the culture cannot have a value
+                // unless wildcards and it's "*"
+                if (culture != null && !(wildcards && culture == "*"))
+                {
+                    if (throwIfInvalid)
+                        throw new NotSupportedException($"Culture \"{culture}\" is invalid because culture variation is disabled.");
+                    return false;
+                }
+            }          
+
+            // if it does not vary by segment
+            // the segment cannot have a value
+            if (!variation.VariesBySegment() && segment != null && !(wildcards && segment == "*"))
             {
                 if (throwIfInvalid)
-                    throw new NotSupportedException($"Segment value \"{segment ?? "<null>"}\" is invalid.");
+                    throw new NotSupportedException($"Segment \"{segment}\" is invalid because segment variation is disabled.");
                 return false;
             }
 
diff --git a/src/Umbraco.Web/Compose/NotificationsComponent.cs b/src/Umbraco.Web/Compose/NotificationsComponent.cs
index db602b3db9..9b2609718e 100644
--- a/src/Umbraco.Web/Compose/NotificationsComponent.cs
+++ b/src/Umbraco.Web/Compose/NotificationsComponent.cs
@@ -209,9 +209,6 @@ namespace Umbraco.Web.Compose
                 //group by the content type variation since the emails will be different
                 foreach(var contentVariantGroup in entities.GroupBy(x => x.ContentType.Variations))
                 {
-                    if (contentVariantGroup.Key == ContentVariation.CultureAndSegment || contentVariantGroup.Key == ContentVariation.Segment)
-                        throw new NotSupportedException("Segments are not yet supported in Umbraco");
-
                     _notificationService.SendNotifications(
                         sender,
                         contentVariantGroup,