Merge branch 'hotfix-10.7.25' into stable

pixl8 · Jan 16, 2017 · 0aa4d5b · 0aa4d5b
2 parents 246fab4 + 4ca4bbc
commit 0aa4d5b
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 5 deletions.
diff --git a/box.json b/box.json
@@ -1,6 +1,6 @@
 {
     "name":"PresideCMS",
-    "version":"10.7.24",
+    "version":"10.7.25",
     "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.24",
+    "version":"10.7.25",
     "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.24
+preside.version=10.7.25
 ##############################
diff --git a/system/services/assetManager/AssetManagerService.cfc b/system/services/assetManager/AssetManagerService.cfc
@@ -1368,12 +1368,20 @@ component displayName="AssetManager Service" {
 				, "asset_version.created_by"
 				, "asset_version.updated_by"
 				, "asset.title"
+				, "asset.asset_folder"
+				, "asset.is_trashed"
 			]
 		);
 
-		var versionImageDimension =  _getImageInfo( getAssetBinary( arguments.assetId, arguments.versionId ) );
-
 		if ( versionToMakeActive.recordCount ) {
+			var versionImageDimension = _getImageInfo( getAssetBinary( arguments.assetId, arguments.versionId ) );
+			var generatedAssetUrl     = generateAssetUrl(
+				  id          = arguments.assetId
+				, versionId   = arguments.versionId
+				, storagePath = versionToMakeActive.storage_path
+				, folder      = versionToMakeActive.asset_folder
+				, trashed 	  = IsBoolean( versionToMakeActive.is_trashed ) && versionToMakeActive.is_trashed
+			);
 			var result = _getAssetDao().updateData( id=arguments.assetId, data={
 				  active_version   = arguments.versionId
 				, storage_path     = versionToMakeActive.storage_path
@@ -1384,6 +1392,7 @@ component displayName="AssetManager Service" {
 				, updated_by       = versionToMakeActive.updated_by
 				, width            = versionImageDimension.width  ?: ""
 				, height           = versionImageDimension.height ?: ""
+				, asset_url 	   = generatedAssetUrl
 			} );
 
 			for( var a in versionToMakeActive ) { var auditDetail = a; }