Fix the issue in Content Editor

SitecoreSupport · Aug 19, 2019 · afaebb9 · afaebb9
1 parent 33cc576
commit afaebb9
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/src/Sitecore.Support.107960/Form/Core/Pipeline/InsertRenderings/Processors/GetDialogUrl.cs b/src/Sitecore.Support.107960/Form/Core/Pipeline/InsertRenderings/Processors/GetDialogUrl.cs
@@ -17,7 +17,8 @@ public void Process(GetRenderingDatasourceArgs args)
       {
         Assert.IsNotNull(args.ContentDatabase, "args.ContentDatabase");
         Assert.IsNotNull(args.ContextItemPath, "args.ContextItemPath");
-        var item = args.ContentDatabase.GetItem(args.ContextItemPath, Language.Parse(WebUtil.GetQueryString("la")));
+        Language contentLanguage = Language.Parse(WebUtil.GetQueryString("la"));
+        var item = args.ContentDatabase.GetItem(args.ContextItemPath, string.IsNullOrEmpty(contentLanguage.ToString()) ? args.ContentLanguage : contentLanguage);
         Assert.IsNotNull(item, "currentItem");
         var obj2 = Context.ClientData.GetValue(StaticSettings.PrefixId + StaticSettings.PlaceholderKeyId);
         var str = obj2?.ToString() ?? string.Empty;

diff --git a/src/Sitecore.Support.107960/Sitecore.Support.107960.csproj b/src/Sitecore.Support.107960/Sitecore.Support.107960.csproj
@@ -21,6 +21,7 @@
     <IISExpressUseClassicPipelineMode />
     <UseGlobalApplicationHostFile />
     <TargetFrameworkProfile />
+    <Use64BitIISExpress />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -48,16 +49,16 @@
       <HintPath>..\packages\SC.Sitecore.ExperienceEditor.8.2.7\lib\Sitecore.ExperienceEditor.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="Sitecore.Forms.Core">
-      <HintPath>..\packages\WFFM.Sitecore.Forms.Core.8.2.5\lib\Sitecore.Forms.Core.dll</HintPath>
+    <Reference Include="Sitecore.Forms.Core, Version=8.2.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\WFFM.Sitecore.Forms.Core.8.2.6\lib\Sitecore.Forms.Core.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="Sitecore.Kernel">
       <HintPath>..\packages\SC.Sitecore.Kernel.8.2.7\lib\Sitecore.Kernel.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="Sitecore.WFFM.Abstractions, Version=8.2.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\WFFM.Sitecore.WFFM.Abstractions.8.2.5\lib\Sitecore.WFFM.Abstractions.dll</HintPath>
+      <HintPath>..\packages\WFFM.Sitecore.WFFM.Abstractions.8.2.6\lib\Sitecore.WFFM.Abstractions.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="System" />

diff --git a/src/Sitecore.Support.107960/packages.config b/src/Sitecore.Support.107960/packages.config
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="SC.Newtonsoft.Json" version="8.2.7" targetFramework="net452" />
   <package id="SC.Sitecore.ExperienceEditor" version="8.2.7" targetFramework="net452" />
   <package id="SC.Sitecore.Kernel" version="8.2.7" targetFramework="net452" />
-  <package id="WFFM.Sitecore.Forms.Core" version="" targetFramework="net452" />
-  <package id="WFFM.Sitecore.WFFM.Abstractions" version="" targetFramework="net452" />
-</packages>
+  <package id="WFFM.Sitecore.Forms.Core" version="8.2.6" targetFramework="net452" />
+  <package id="WFFM.Sitecore.WFFM.Abstractions" version="8.2.6" targetFramework="net452" />
+</packages>