Merge branch 'develop'

ActiveIS · Nov 24, 2022 · ce18ce8 · ce18ce8
2 parents 61e9f29 + a7a225f
commit ce18ce8
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/ActiveIS.UmbracoForms.ConfirmInput/ActiveIS.UmbracoForms.ConfirmInput.csproj b/ActiveIS.UmbracoForms.ConfirmInput/ActiveIS.UmbracoForms.ConfirmInput.csproj
@@ -146,17 +146,17 @@
     <Reference Include="Umbraco.Core, Version=8.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\UmbracoCms.Core.8.17.2\lib\net472\Umbraco.Core.dll</HintPath>
     </Reference>
-    <Reference Include="Umbraco.Forms.Core, Version=8.10.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\UmbracoForms.Core.8.10.2\lib\net472\Umbraco.Forms.Core.dll</HintPath>
+    <Reference Include="Umbraco.Forms.Core, Version=8.13.4.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\UmbracoForms.Core.8.13.4\lib\net472\Umbraco.Forms.Core.dll</HintPath>
     </Reference>
-    <Reference Include="Umbraco.Forms.Core.Providers, Version=8.10.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\UmbracoForms.Core.8.10.2\lib\net472\Umbraco.Forms.Core.Providers.dll</HintPath>
+    <Reference Include="Umbraco.Forms.Core.Providers, Version=8.13.4.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\UmbracoForms.Core.8.13.4\lib\net472\Umbraco.Forms.Core.Providers.dll</HintPath>
     </Reference>
-    <Reference Include="Umbraco.Forms.Web, Version=8.10.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\UmbracoForms.Core.8.10.2\lib\net472\Umbraco.Forms.Web.dll</HintPath>
+    <Reference Include="Umbraco.Forms.Web, Version=8.13.4.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\UmbracoForms.Core.8.13.4\lib\net472\Umbraco.Forms.Web.dll</HintPath>
     </Reference>
     <Reference Include="Umbraco.Licensing, Version=2.0.33.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\UmbracoForms.Core.8.10.2\lib\net472\Umbraco.Licensing.dll</HintPath>
+      <HintPath>..\packages\UmbracoForms.Core.8.13.4\lib\net472\Umbraco.Licensing.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>

diff --git a/ActiveIS.UmbracoForms.ConfirmInput/Fields/ConfirmInputField.cs b/ActiveIS.UmbracoForms.ConfirmInput/Fields/ConfirmInputField.cs
@@ -7,6 +7,7 @@
 using Umbraco.Forms.Core.Data.Storage;
 using Umbraco.Forms.Core.Enums;
 using Umbraco.Forms.Core.Models;
+using Umbraco.Forms.Core.Services;
 
 namespace ActiveIS.UmbracoForms.ConfirmInput.Fields
 {
@@ -36,9 +37,8 @@ public override string GetDesignView()
         public string Placeholder { get; set; }
 
         public override IEnumerable<string> ValidateField(Form form, Field field, IEnumerable<object> postedValues, HttpContextBase context,
-            IFormStorage formStorage)
+            IFormStorage formStorage, IFieldTypeStorage fieldTypeStorage, List<string> errors)
         {
-            var errors = new List<string>();
             var fieldValues = postedValues.ToList();
 
             if (!fieldValues[0].ToString().Equals(fieldValues[1].ToString(), StringComparison.InvariantCultureIgnoreCase))
@@ -51,7 +51,7 @@ public override IEnumerable<string> ValidateField(Form form, Field field, IEnume
                 errors.Add(ValidationErrorMessage);
             }
 
-            return errors.Any() ? errors : base.ValidateField(form, field, fieldValues.Take(1), context, formStorage);
+            return base.ValidateField(form, field, postedValues.Take(1), context, formStorage, fieldTypeStorage, errors);
         }
 
         public override IEnumerable<string> RequiredJavascriptFiles(Field field)

diff --git a/ActiveIS.UmbracoForms.ConfirmInput/packages.config b/ActiveIS.UmbracoForms.ConfirmInput/packages.config
@@ -29,5 +29,5 @@
   <package id="System.ValueTuple" version="4.5.0" targetFramework="net472" />
   <package id="Umbraco.SqlServerCE" version="4.0.0.1" targetFramework="net472" />
   <package id="UmbracoCms.Core" version="8.17.2" targetFramework="net472" />
-  <package id="UmbracoForms.Core" version="8.10.2" targetFramework="net472" />
+  <package id="UmbracoForms.Core" version="8.13.4" targetFramework="net472" />
 </packages>