- fix: Tinymce insertImage

- fix: Edit Style returns wrong page
 - fix: Can not make Shortcut for CollaborationSystem

docs/changelog/6.x.x.txt

@@ -33,8 +33,12 @@
  - fix: Alternate Apache Port breaks "Commit with Approval"
  - Rearranged the "Getting Started" page in the default content to make it
    easier to follow for noobs.
+ - fix: Tinymce insertImage
+ - fix: Edit Style returns wrong page
+ - fix: Can not make Shortcut for CollaborationSystem
  - fix: EMS Transactions Dropping Free Events
 
+
 6.99.3
  - Someone removed the status from the submission templates. That has been
    fixed.

lib/WebGUI/AssetClipboard.pm

@@ -213,8 +213,7 @@ sub www_createShortcut {
 	my $self = shift;
 	return $self->session->privilege->insufficient() unless ($self->session->user->isInGroup(4));	
 	my $isOnDashboard = ref $self->getParent eq 'WebGUI::Asset::Wobject::Dashboard';
-	my $target = $isOnDashboard ? $self->getParent : $self;
-	my $child = $target->addChild({
+	my $child = $self->getParent->addChild({
 		className=>'WebGUI::Asset::Shortcut',
 		shortcutToAssetId=>$self->getId,
 		title=>$self->getTitle,
@@ -228,7 +227,7 @@ sub www_createShortcut {
 		templateId=>'PBtmpl0000000000000140'
 	});
 	if ($isOnDashboard) {
-		return $target->www_view;
+		return $self->getParent->www_view;
 	} else {
 		$child->cut;
 		return $self->getContainer->www_manageAssets if ($self->session->form->process("proceed") eq "manageAssets");

www/extras/tinymce2/jscripts/tiny_mce/plugins/insertImage/insertImage.html

@@ -117,7 +117,7 @@ function OKClick() {
 	var preImageTag = '';
 	var postImageTag = '';
 	if (border > 0) {
-		imageTag = 'border: ' + border + 'px;';
+		imageTag += 'border: ' + border + 'px;';
 	}
 	if (hspace > 0) {
 		imageTag += 'margin-left: ' + hspace + 'px; margin-right: ' + hspace + 'px;';