CONTENTBOX-1405 #resolve

Cloning Fails if Title of Page/entry/contentstore that Contains an Apostrophe
Ortus-Solutions · Mar 17, 2022 · a0a3c7e · a0a3c7e
1 parent 8e63397
commit a0a3c7e
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 6 deletions.
diff --git a/modules/contentbox/modules/contentbox-admin/views/contentStore/indexTable.cfm b/modules/contentbox/modules/contentbox-admin/views/contentStore/indexTable.cfm
@@ -127,7 +127,12 @@
 			    		<cfif prc.oCurrentAuthor.checkPermission( "CONTENTSTORE_EDITOR,CONTENTSTORE_ADMIN" )>
 							<!--- Clone Command --->
 							<li>
-								<a href="javascript:contentListHelper.openCloneDialog( '#content.getContentID()#', '#URLEncodedFormat( content.getTitle() )#' )">
+								<a
+									href="javascript:contentListHelper.openCloneDialog(
+										'#encodeForJavaScript( content.getContentID() )#',
+										'#encodeForJavaScript( content.getTitle() )#'
+									)"
+								>
 									<i class="far fa-clone fa-lg"></i> Clone
 								</a>
 							</li>
@@ -184,4 +189,4 @@
 <cfelse>
 	<span class="label label-info">Total Records: #prc.contentCount#</span>
 </cfif>
-</cfoutput>
+</cfoutput>
diff --git a/modules/contentbox/modules/contentbox-admin/views/entries/indexTable.cfm b/modules/contentbox/modules/contentbox-admin/views/entries/indexTable.cfm
@@ -124,7 +124,12 @@
 			    		<cfif prc.oCurrentAuthor.checkPermission( "ENTRIES_EDITOR,ENTRIES_ADMIN" )>
 						<!--- Clone Command --->
 						<li>
-							<a href="javascript:contentListHelper.openCloneDialog( '#entry.getContentID()#','#URLEncodedFormat(entry.getTitle())#')">
+							<a
+								href="javascript:contentListHelper.openCloneDialog(
+									'#encodeForJavascript( entry.getContentID() )#',
+									'#encodeForJavascript( entry.getTitle() )#'
+								)"
+							>
 								<i class="far fa-clone fa-lg"></i> Clone
 							</a>
 						</li>
@@ -196,4 +201,4 @@
 	<span class="label label-info">Total Records: #prc.contentCount#</span>
 </cfif>
 
-</cfoutput>
+</cfoutput>
diff --git a/modules/contentbox/modules/contentbox-admin/views/pages/indexTable.cfm b/modules/contentbox/modules/contentbox-admin/views/pages/indexTable.cfm
@@ -186,8 +186,8 @@
 								<li class="mb5">
 									<a
 										href="javascript:contentListHelper.openCloneDialog(
-											'#page.getContentID()#',
-											'#URLEncodedFormat( page.getTitle() )#'
+											'#encodeForJavascript( page.getContentID() )#',
+											'#encodeForJavascript( page.getTitle() )#'
 										)"
 									>
 										<i class="far fa-clone fa fa-lg"></i> Clone