Merge branch 'hotfix-10.10.18' into stable

pixl8 · Jan 10, 2019 · b49c3f6 · b49c3f6
2 parents 83dc5f6 + 204d904
commit b49c3f6
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/system/handlers/admin/SiteTree.cfc b/system/handlers/admin/SiteTree.cfc
@@ -618,6 +618,13 @@ component extends="preside.system.base.AdminHandler" {
 				prc.mergeFormName = "";
 			}
 
+			if ( prc.pageIsMultilingual ) {
+				version = versioningService.getLatestVersionNumber(
+					  objectName = translationPageTypeObject
+					, filter     = { _translation_source_record=pageId, _translation_language=prc.language.id }
+				);
+			}
+
 			var translation = multiLingualPresideObjectService.selectTranslation( objectName=prc.pageTypeObjectName, id=pageId, languageId=prc.language.id, useCache=false, version=version );
 			for( var t in translation ) {
 				prc.savedTranslation.append( t );

diff --git a/system/views/admin/datamanager/_listingActions.cfm b/system/views/admin/datamanager/_listingActions.cfm
@@ -7,7 +7,7 @@
 				<cfif IsSimpleValue( action )>
 					#action#
 				<cfelse>
-					<a class="<cfif i == 1>row-link</cfif><cfif Len( Trim( action.class ?: "" ))> #action.class#"</cfif>"<cfif Len( Trim( action.contextKey ?: "" ))> data-context-key="#action.contextKey#"</cfif> href="#( action.link ?: "" )#"<cfif Len( Trim( action.title ?: "" ))> title="#HtmlEditFormat( action.title )#"</cfif><cfif Len( Trim( action.target ?: "" ))> target="#action.target#"</cfif>>
+					<a class="<cfif i == 1>row-link</cfif><cfif Len( Trim( action.class ?: "" ))> #action.class#</cfif>"<cfif Len( Trim( action.contextKey ?: "" ))> data-context-key="#action.contextKey#"</cfif> href="#( action.link ?: "" )#"<cfif Len( Trim( action.title ?: "" ))> title="#HtmlEditFormat( action.title )#"</cfif><cfif Len( Trim( action.target ?: "" ))> target="#action.target#"</cfif>>
 						<i class="fa fa-fw #( action.icon ?: "" )#"></i>
 					</a>
 				</cfif>

diff --git a/system/views/admin/sitetree/translatePage.cfm b/system/views/admin/sitetree/translatePage.cfm
@@ -32,8 +32,8 @@
 					</cfif>
 				</cfloop>
 			</ul>
-		</cfif>
+		</div>
-	</div>
+	</cfif>
 
 	#renderViewlet( event='admin.datamanager.translationVersionNavigator', args={
 		  object         = pageIsMultilingual ? "page" : pageTypeObjectName