Index: mod1/dragdrop-min.js
===================================================================
--- mod1/dragdrop-min.js	(revision 27087)
+++ mod1/dragdrop-min.js	(working copy)
@@ -1 +1 @@
-var sortable_currentItem;function sortable_unhideRecord(it,command){jumpToUrl(command)}function sortable_hideRecord(it,command){if(!sortable_removeHidden){return jumpToUrl(command)}while(it.className!="sortableItem"){it=it.parentNode}new Ajax.Request(command);new Effect.Fade(it,{duration:0.5,afterFinish:sortable_hideRecordCallBack})}function sortable_hideRecordCallBack(obj){var el=obj.element;while(el.lastChild){el.removeChild(el.lastChild)}}function sortable_unlinkRecordCallBack(obj){var el=obj.element;var pn=el.parentNode;pn.removeChild(el);sortable_update(pn)}function sortable_unlinkRecord(id){new Ajax.Request("index.php?"+sortable_linkParameters+"&ajaxUnlinkRecord="+escape(id));new Effect.Fade(id,{duration:0.5,afterFinish:sortable_unlinkRecordCallBack})}function sortable_updateItemButtons(el,position,pID){var p=new Array();var p1=new Array();var href="";var i=0;var newPos=escape(pID+position);var childs=el.childElements();var buttons=childs[0].childElements()[0].childElements()[0].childElements()[1].childNodes;for(i=0;i<buttons.length;i++){if(buttons[i].nodeType!=1){continue}href=buttons[i].href;if(href.charAt(href.length-1)=="#"){continue}if((p=href.split("unlinkRecord")).length==2){buttons[i].href=p[0]+"unlinkRecord('"+newPos+"');"}else{if((p=href.split("deleteRecord")).length==2){buttons[i].href=p[0]+"deleteRecord="+newPos}else{if((p=href.split("CB[el][tt_content")).length==2){p1=p[1].split("=");buttons[i].href=p[0]+"CB[el][tt_content"+p1[0]+"="+newPos}else{if((p=href.split("&parentRecord=")).length==2){buttons[i].href=p[0]+"&parentRecord="+newPos}else{if((p=href.split("&destination=")).length==2){buttons[i].href=p[0]+"&destination="+newPos}}}}}}if((p=childs[1].href.split("&parentRecord=")).length==2){childs[1].href=p[0]+"&parentRecord="+newPos}buttons=childs[2].childElements()[0];if(buttons&&(p=buttons.href.split("&destination=")).length==2){buttons.href=p[0]+"&destination="+newPos}}function sortable_updatePasteButtons(oldPos,newPos){var i=0;var p=new Array;var href="";var buttons=document.getElementsByClassName("sortablePaste");if(buttons[i].firstChild&&buttons[i].firstChild.href.indexOf("&source="+escape(oldPos))!=-1){for(i=0;i<buttons.length;i++){if(buttons[i].firstChild){href=buttons[i].firstChild.href;if((p=href.split("&source="+escape(oldPos))).length==2){buttons[i].firstChild.href=p[0]+"&source="+escape(newPos)+p[1]}}}}}function sortable_update(el){var node=el.firstChild;var i=1;while(node!=null){if(node.className=="sortableItem"){if(sortable_currentItem&&node.id==sortable_currentItem.id){var url="index.php?"+sortable_linkParameters+"&ajaxPasteRecord=cut&source="+sortable_items[sortable_currentItem.id]+"&destination="+sortable_items[el.id]+(i-1);new Ajax.Request(url);sortable_updatePasteButtons(sortable_items[node.id],sortable_items[el.id]+i);sortable_currentItem=false}sortable_updateItemButtons(node,i,sortable_items[el.id]);sortable_items[node.id]=sortable_items[el.id]+i;i++}node=node.nextSibling}}function sortable_change(el){sortable_currentItem=el}function tv_createSortable(s,containment){Sortable.create(s,{tag:"div",ghosting:false,format:/(.*)/,handle:"sortable_handle",dropOnEmpty:true,constraint:false,containment:containment,onChange:sortable_change,onUpdate:sortable_update})};
\ No newline at end of file
+var sortable_currentItem;function sortable_unhideRecord(it,command){jumpToUrl(command)}function sortable_hideRecord(it,command){if(!sortable_removeHidden){return jumpToUrl(command)}while(it.className!="sortableItem"){it=it.parentNode}new Ajax.Request(command);new Effect.Fade(it,{duration:0.5,afterFinish:sortable_hideRecordCallBack})}function sortable_hideRecordCallBack(obj){var el=obj.element;while(el.lastChild){el.removeChild(el.lastChild)}}function sortable_unlinkRecordCallBack(obj){var el=obj.element;var pn=el.parentNode;pn.removeChild(el);sortable_update(pn)}function sortable_unlinkRecord(pointer,id){new Ajax.Request("index.php?"+sortable_linkParameters+"&ajaxUnlinkRecord="+escape(pointer));new Effect.Fade(id,{duration:0.5,afterFinish:sortable_unlinkRecordCallBack})}function sortable_updateItemButtons(el,position,pID){var p=new Array();var p1=new Array();var href="";var i=0;var newPos=escape(pID+position);var childs=el.childElements();var buttons=childs[0].childElements()[0].childElements()[0].childElements()[1].childNodes;for(i=0;i<buttons.length;i++){if(buttons[i].nodeType!=1){continue}href=buttons[i].href;if(href.charAt(href.length-1)=="#"){continue}if((p=href.split("unlinkRecord")).length==2){p2=p[1].split("','");buttons[i].href=p[0]+"unlinkRecord('"+newPos+"','"+p2[1]}else{if((p=href.split("deleteRecord")).length==2){buttons[i].href=p[0]+"deleteRecord="+newPos}else{if((p=href.split("CB[el][tt_content")).length==2){p1=p[1].split("=");buttons[i].href=p[0]+"CB[el][tt_content"+p1[0]+"="+newPos}else{if((p=href.split("&parentRecord=")).length==2){buttons[i].href=p[0]+"&parentRecord="+newPos}else{if((p=href.split("&destination=")).length==2){buttons[i].href=p[0]+"&destination="+newPos}}}}}}if((p=childs[1].href.split("&parentRecord=")).length==2){childs[1].href=p[0]+"&parentRecord="+newPos}buttons=childs[2].childElements()[0];if(buttons&&(p=buttons.href.split("&destination=")).length==2){buttons.href=p[0]+"&destination="+newPos}}function sortable_updatePasteButtons(oldPos,newPos){var i=0;var p=new Array;var href="";var buttons=document.getElementsByClassName("sortablePaste");if(buttons[i].firstChild&&buttons[i].firstChild.href.indexOf("&source="+escape(oldPos))!=-1){for(i=0;i<buttons.length;i++){if(buttons[i].firstChild){href=buttons[i].firstChild.href;if((p=href.split("&source="+escape(oldPos))).length==2){buttons[i].firstChild.href=p[0]+"&source="+escape(newPos)+p[1]}}}}}function sortable_update(el){var node=el.firstChild;var i=1;while(node!=null){if(node.className=="sortableItem"){if(sortable_currentItem&&node.id==sortable_currentItem.id){var url="index.php?"+sortable_linkParameters+"&ajaxPasteRecord=cut&source="+sortable_items[sortable_currentItem.id]+"&destination="+sortable_items[el.id]+(i-1);new Ajax.Request(url);sortable_updatePasteButtons(sortable_items[node.id],sortable_items[el.id]+i);sortable_currentItem=false}sortable_updateItemButtons(node,i,sortable_items[el.id]);sortable_items[node.id]=sortable_items[el.id]+i;i++}node=node.nextSibling}}function sortable_change(el){sortable_currentItem=el}function tv_createSortable(s,containment){Sortable.create(s,{tag:"div",ghosting:false,format:/(.*)/,handle:"sortable_handle",dropOnEmpty:true,constraint:false,containment:containment,onChange:sortable_change,onUpdate:sortable_update})};
\ No newline at end of file
Index: mod1/dragdrop.js
===================================================================
--- mod1/dragdrop.js	(revision 27087)
+++ mod1/dragdrop.js	(working copy)
@@ -33,8 +33,8 @@
 	sortable_update(pn);
 }
 
-function sortable_unlinkRecord(id) {
-	new Ajax.Request("index.php?" + sortable_linkParameters + "&ajaxUnlinkRecord="+escape(id)); /* xxx */
+function sortable_unlinkRecord(pointer, id) {
+	new Ajax.Request("index.php?" + sortable_linkParameters + "&ajaxUnlinkRecord="+escape(pointer)); /* xxx */
 	new Effect.Fade(id,
 		{ duration: 0.5,
 		afterFinish: sortable_unlinkRecordCallBack });
@@ -52,7 +52,8 @@
 		//alert(href);
 		if (href.charAt(href.length - 1) == "#") continue;
 		if ((p = href.split("unlinkRecord")).length == 2) {
-			buttons[i].href = p[0] + "unlinkRecord(\'" + newPos + "\');";
+			p2 = p[1].split("\',\'")
+			buttons[i].href = p[0] + "unlinkRecord(\'" + newPos + "\',\'" + p2[1];
 		} else if ((p = href.split("deleteRecord")).length == 2) {
 			buttons[i].href = p[0] + "deleteRecord=" + newPos;
 		} else if((p = href.split("CB[el][tt_content")).length == 2) {
Index: mod1/index.php
===================================================================
--- mod1/index.php	(revision 27087)
+++ mod1/index.php	(working copy)
@@ -402,12 +402,12 @@
 			);
 
 				//Prototype /Scriptaculous
-				// prototype is loaded before, so no need to include twice. 
+				// prototype is loaded before, so no need to include twice.
 				//TODO: switch to $this->doc->JScodeLibArray for preventing double inclusion
 			#$this->doc->JScode .= '<script src="' . $this->doc->backPath . 'contrib/prototype/prototype.js" type="text/javascript"></script>';
 			$this->doc->JScode .= '<script src="' . $this->doc->backPath . 'contrib/scriptaculous/scriptaculous.js?load=effects,dragdrop" type="text/javascript"></script>';
 			$this->doc->JScode .= '<script src="' . t3lib_div::locationHeaderUrl(t3lib_div::resolveBackPath($this->doc->backPath . '../' . t3lib_extMgm::siteRelPath('templavoila') . 'mod1/dragdrop-min.js')) . '" type="text/javascript"></script>';
-              
+
 				// Set up JS for dynamic tab menu and side bar
 			$this->doc->JScode .= $this->doc->getDynTabMenuJScode();
 			$this->doc->JScode .= $this->modTSconfig['properties']['sideBarEnable'] ? $this->sideBarObj->getJScode() : '';
@@ -600,7 +600,7 @@
 		} else {
 			$output.= $this->render_framework_allSheets($contentTreeData['tree'], $this->currentLanguageKey);
 		}
-        
+
 			// See http://bugs.typo3.org/view.php?id=4821
 		$renderHooks = $this->hooks_prepareObjectsArray('render_editPageScreen');
 		foreach ($renderHooks as $hookObj)	{
@@ -616,7 +616,7 @@
 		$sys_notes = recordList::showSysNotesForPage();
 		if ($sys_notes) {
 			$output .= $this->doc->section($LANG->sL('LLL:EXT:cms/layout/locallang.xml:internalNotes'), str_replace('sysext/sys_note/ext_icon.gif', $GLOBALS['BACK_PATH'] . 'sysext/sys_note/ext_icon.gif', $sys_notes), 0, 1);
-		}				
+		}
 		return $output;
 	}
 
@@ -729,7 +729,7 @@
 				if (!$this->translatorMode && $canEditContent) {
 						// Create CE specific buttons:
 					$linkMakeLocal = !$elementBelongsToCurrentPage ? $this->link_makeLocal('<img'.t3lib_iconWorks::skinImg($this->doc->backPath,t3lib_extMgm::extRelPath('templavoila').'mod1/makelocalcopy.gif','').' title="'.$LANG->getLL('makeLocal').'" border="0" alt="" />', $parentPointer) : '';
-					if(	$this->modTSconfig['properties']['enableDeleteIconForLocalElements'] < 2 || 
+					if(	$this->modTSconfig['properties']['enableDeleteIconForLocalElements'] < 2 ||
 						!$elementBelongsToCurrentPage ||
 						$this->global_tt_content_elementRegister[$contentTreeArr['el']['uid']] > 1
 					) {
@@ -935,7 +935,7 @@
 							}
 
 							$cellContent .= $cellFragment;
-					
+
 						}
 					}
 				}
@@ -1457,7 +1457,7 @@
 				} else {
 						// Create CE specific buttons:
 					$linkMakeLocal = !$elementBelongsToCurrentPage ? $this->link_makeLocal('<img'.t3lib_iconWorks::skinImg($this->doc->backPath,t3lib_extMgm::extRelPath('templavoila').'mod1/makelocalcopy.gif','').' title="'.$LANG->getLL('makeLocal').'" border="0" alt="" />', $parentPointer) : '';
-					if(	$this->modTSconfig['properties']['enableDeleteIconForLocalElements'] < 2 || 
+					if(	$this->modTSconfig['properties']['enableDeleteIconForLocalElements'] < 2 ||
 						!$elementBelongsToCurrentPage ||
 						$this->global_tt_content_elementRegister[$contentTreeArr['el']['uid']] > 1
 					) {
@@ -1682,7 +1682,7 @@
 	 *
 	 *******************************************/
 
-	 
+
 	/**
 	 * Returns an HTML link for editing
 	 *
@@ -1738,7 +1738,7 @@
 
 		return $this->link_hide($label, $el['table'], $el['uid'], $el['isHidden']);
 	}
-	
+
 	/**
 	 * [Describe function...]
 	 *
@@ -1805,13 +1805,14 @@
 	 */
 	function link_unlink($label, $unlinkPointer, $realDelete=FALSE, $foreignReferences=FALSE)	{
 
-		$unlinkPointerString = rawurlencode($this->apiObj->flexform_getStringFromPointer ($unlinkPointer));
+		$unlinkPointerString = $this->apiObj->flexform_getStringFromPointer ($unlinkPointer);
+		$encodedUnlinkPointerString = rawurlencode($unlinkPointerString);
 
 		if ($realDelete)	{
 			$LLlabel = $foreignReferences ? 'deleteRecordWithReferencesMsg' : 'deleteRecordMsg';
-			return '<a href="index.php?' . $this->link_getParameters() . '&amp;deleteRecord=' . $unlinkPointerString . '" onclick="' . htmlspecialchars('return confirm(' . $GLOBALS['LANG']->JScharCode($GLOBALS['LANG']->getLL($LLlabel)) . ');') . '">' . $label . '</a>';
+			return '<a href="index.php?' . $this->link_getParameters() . '&amp;deleteRecord=' . $encodedUnlinkPointerString . '" onclick="' . htmlspecialchars('return confirm(' . $GLOBALS['LANG']->JScharCode($GLOBALS['LANG']->getLL($LLlabel)) . ');') . '">' . $label . '</a>';
 		} else {
-			return '<a href="javascript:'.htmlspecialchars('if (confirm(' . $GLOBALS['LANG']->JScharCode($GLOBALS['LANG']->getLL('unlinkRecordMsg')) . '))') . 'sortable_unlinkRecord(\'' . $unlinkPointerString . '\');">' . $label . '</a>';
+			return '<a href="javascript:'.htmlspecialchars('if (confirm(' . $GLOBALS['LANG']->JScharCode($GLOBALS['LANG']->getLL('unlinkRecordMsg')) . '))') . 'sortable_unlinkRecord(\'' . $encodedUnlinkPointerString . '\',\'' . $this->addSortableItem ($unlinkPointerString) . '\');">' . $label . '</a>';
 		}
 	}