From 6f96677a5e0847dbd8b8048910223b9e1335f659 Mon Sep 17 00:00:00 2001
From: JT Smith <jt@plainblack.com>
Date: Mon, 12 Jun 2006 21:35:49 +0000
Subject: [PATCH]  - fix: Tinymce insertImage  - fix: Edit Style returns wrong
 page  - fix: Can not make Shortcut for CollaborationSystem

---
 docs/changelog/6.x.x.txt                                     | 4 ++++
 lib/WebGUI/AssetClipboard.pm                                 | 5 ++---
 .../jscripts/tiny_mce/plugins/insertImage/insertImage.html   | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/docs/changelog/6.x.x.txt b/docs/changelog/6.x.x.txt
index 15d9151c1..179465f91 100644
--- a/docs/changelog/6.x.x.txt
+++ b/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.
diff --git a/lib/WebGUI/AssetClipboard.pm b/lib/WebGUI/AssetClipboard.pm
index d41379c18..71abcc3d7 100644
--- a/lib/WebGUI/AssetClipboard.pm
+++ b/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");
diff --git a/www/extras/tinymce2/jscripts/tiny_mce/plugins/insertImage/insertImage.html b/www/extras/tinymce2/jscripts/tiny_mce/plugins/insertImage/insertImage.html
index 168ac4a53..b4f7b29c5 100644
--- a/www/extras/tinymce2/jscripts/tiny_mce/plugins/insertImage/insertImage.html
+++ b/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;';