Merge branch 'hotfix-10.7.24' into stable

pixl8 · Jan 15, 2017 · 246fab4 · 246fab4
2 parents f198fe7 + 94df81c
commit 246fab4
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/box.json b/box.json
@@ -1,6 +1,6 @@
 {
     "name":"PresideCMS",
-    "version":"10.7.23",
+    "version":"10.7.24",
     "author":"Pixl8 Interactive",
     "createPackageDirectory":true,
     "packageDirectory":"preside",

diff --git a/box.json.no.deps b/box.json.no.deps
@@ -1,6 +1,6 @@
 {
     "name":"PresideCMS",
-    "version":"10.7.23",
+    "version":"10.7.24",
     "author":"Pixl8 Interactive",
     "createPackageDirectory":true,
     "packageDirectory":"preside",

diff --git a/support/build/build.properties b/support/build/build.properties
@@ -2,5 +2,5 @@ build.number.remote.url=http://downloads.presidecms.com/presidecms/build.number
 
 ##############################
 # MANUALLY UPDATE EACH VERSION
-preside.version=10.7.23
+preside.version=10.7.24
 ##############################
diff --git a/system/migrations/upgrades/10-7-0.cfc b/system/migrations/upgrades/10-7-0.cfc
@@ -60,9 +60,10 @@ component {
 						                left join #escapedTable# #olderAlias# on #olderAlias#.id = latest.id and #olderAlias#._version_number > latest._version_number
 						                where     #olderAlias#.id is null";
 
-						publishedSql = "update    #escapedTable# #latestAlias#
-						                left join #escapedTable# #olderAlias# on #olderAlias#.id = latest.id and #olderAlias#._version_number > latest._version_number and ( #olderAlias#._version_is_draft is null or #olderAlias#._version_is_draft = '0' )
+						publishedSql = "update    #latestAlias#
 						                set       #latestAlias#._version_is_latest = '1'
+						                from      #escapedTable# #latestAlias#
+						                left join #escapedTable# #olderAlias# on #olderAlias#.id = latest.id and #olderAlias#._version_number > latest._version_number and ( #olderAlias#._version_is_draft is null or #olderAlias#._version_is_draft = '0' )
 						                where     #olderAlias#.id is null
 						                and       ( #latestAlias#._version_is_draft is null or #latestAlias#._version_is_draft = '0' )";
 					break;
@@ -81,7 +82,7 @@ component {
 														set       _version_is_latest = '1'
 														where not exists (
 																select 		1
-																from			#escapedTable# as #olderAlias# 
+																from			#escapedTable# as #olderAlias#
 																where			#olderAlias#.id = #latestAlias#.id and #olderAlias#._version_number > #latestAlias#._version_number
 																and 			( #olderAlias#._version_is_draft is null or #olderAlias#._version_is_draft = '0' )
 														)