v2.3.8

skamphuis · Oct 7, 2013 · ab0f7f6 · ab0f7f6
1 parent c32d48b
commit ab0f7f6
Show file tree

Hide file tree

Showing 10 changed files with 450 additions and 28 deletions.
diff --git a/Components/General/CurrentCart.vb b/Components/General/CurrentCart.vb
@@ -863,9 +863,11 @@ Namespace NEvoWeb.Modules.NB_Store
 
                 Dim strFolderpath As String = GetSubFolderPath(DocPath, PS.PortalId)
 
-                FileSystemUtils.UploadFile(DocPath, fu.PostedFile)
-                FileSystemUtils.MoveFile(DocPath & fu.FileName, DocPath, PS)
-
+                ' Change to removeCookieQueryValue Obsolete MoveFile and upload file function
+                fu.SaveAs(DocPath)
+                FileSystemUtils.CopyFile(DocPath & fu.FileName, DocPath)
+                FileSystemUtils.DeleteFile(DocPath & fu.FileName)
+
                 Dim folderInfo As DotNetNuke.Services.FileSystem.FolderInfo = FileSystemUtils.GetFolder(PS.PortalId, ORDERUPLOADFOLDER)
                 If folderInfo.StorageLocation = FolderController.StorageLocationTypes.SecureFileSystem Then
                     DocPath = PS.HomeDirectoryMapPath & ORDERUPLOADFOLDER & "\" & strGUID & System.IO.Path.GetExtension(fu.FileName) & glbProtectedExtension

diff --git a/Components/General/ImgReSize.vb b/Components/General/ImgReSize.vb
@@ -47,7 +47,8 @@ Namespace NEvoWeb.Modules.NB_Store
                         System.IO.File.Move(SrcFilePathName, fOut)
                     Catch ex As Exception
                         'try this, doesn't seem to work, and haven;t got time to fix at the moment
-                        FileSystemUtils.MoveFile(SrcFilePathName, fOut, PortalSettings)
+						FileSystemUtils.CopyFile(SrcFilePathName, fOut)
+						FileSystemUtils.DeleteFile(SrcFilePathName)
                     End Try
                 End If
             End If

diff --git a/Components/General/ProductTemplate.vb b/Components/General/ProductTemplate.vb
@@ -2208,13 +2208,15 @@ Namespace NEvoWeb.Modules.NB_Store
             cmd.CommandName = "AddRelated"
             cmd.Visible = CBool(_NestedLevel((_NestedLevel.Count - 1)))
 
-            '1 July 2013 by Sergey Velichko: Added functionality to handle ajax calls for add related products
-            'Begin of changes
-            If (_RelatedList.IndexOf(Int32.Parse(strProductID)) <> -1) Then
-                cmd.Visible = False
-            End If
-            'End of changes
-        End Sub
+			If (_RelatedList IsNot Nothing) Then 'DCL - _RelatedList causes error on first load is releated list null
+				'1 July 2013 by Sergey Velichko: Added functionality to handle ajax calls for add related products
+				'Begin of changes
+				If (_RelatedList.IndexOf(Int32.Parse(strProductID)) <> -1) Then
+					cmd.Visible = False
+				End If
+				'End of changes
+			End If
+		End Sub
 
         Private Sub AddToWishList_DataBinding(ByVal sender As Object, ByVal e As System.EventArgs)
             Dim cmd As LinkButton

diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb
@@ -30,5 +30,5 @@ Imports System.Runtime.InteropServices
 ' You can specify all the values or you can default the Build and Revision Numbers 
 ' by using the '*' as shown below:
 
-<Assembly: AssemblyVersion("2.3.7.2")> 
-<Assembly: AssemblyFileVersion("2.3.7.2")> 
+<Assembly: AssemblyVersion("2.3.8.0")> 
+<Assembly: AssemblyFileVersion("2.3.8.0")> 
diff --git a/installation/02.03.06.SqlDataProvider b/installation/02.03.06.SqlDataProvider
@@ -23,7 +23,7 @@ GO
 SET ANSI_NULLS ON 
 GO
 
-if exists (select * from {databaseOwner}sysobjects where id = object_id(N'{databaseOwner}[{objectQualifier}NEvoweb_NB_Store_Products_GetList]') and OBJECTPROPERTY(id, N'IsProcedure') = 1)
+if exists (select * from dbo.sysobjects where id = object_id(N'{databaseOwner}[{objectQualifier}NEvoweb_NB_Store_Products_GetList]') and OBJECTPROPERTY(id, N'IsProcedure') = 1)
 drop procedure {databaseOwner}[{objectQualifier}NEvoweb_NB_Store_Products_GetList]
 GO
 
@@ -216,7 +216,7 @@ end
 GO
 
 
-if exists (select * from {databaseOwner}sysobjects where id = object_id(N'{databaseOwner}[{objectQualifier}NEvoweb_NB_Store_Products_GetListSize]') and OBJECTPROPERTY(id, N'IsProcedure') = 1)
+if exists (select * from dbo.sysobjects where id = object_id(N'{databaseOwner}[{objectQualifier}NEvoweb_NB_Store_Products_GetListSize]') and OBJECTPROPERTY(id, N'IsProcedure') = 1)
 drop procedure {databaseOwner}[{objectQualifier}NEvoweb_NB_Store_Products_GetListSize]
 GO