From 03c411b68e267453c930704ef422623cd60b8898 Mon Sep 17 00:00:00 2001
From: Colin Kuskie <colink@perldreamer.com>
Date: Wed, 3 Dec 2008 18:14:13 +0000
Subject: [PATCH] Remove 7.5.34 changelog that snuck into the 7.6 branch.
 Forward port imageTree thumbnail relative url fix for sites with multiple
 hostnames

---
 docs/changelog/7.x.x.txt    | 18 +-----------------
 lib/WebGUI/Form/HTMLArea.pm |  2 +-
 2 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 46c83a252..59d09facf 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -1,4 +1,5 @@
 7.6.6
+ - fixed #8792: Image Preview gives ERROR in Collateral Manager
 
 7.6.5
  - security: A problem was discovered and fixed in which users could email executable attachments to a collaboration system and then when viewed online, could execute them. 
@@ -98,23 +99,6 @@
  - fixed #9143: Yes No user profile fields problem when default == 1
  - fixed #8775: Miscount in number of replies in CS Thread (Martin Kamerbeek / Oqapi)
 
-7.5.34
- - fixed: Regression with ProfileField->formField. Added tests to prevent future regression
- - fixed #8849: More missing i18n
- - fixed: Performance issue with Stow. Added a way to bypass safety for speed.
- - fixed #4182: Edit links show in asset manager for locked assets
- - fixed #8971: UserList shows accounts that have been self-deactivated (Bernd Kalbfuß-Zimmermann)
- - fixed #4199: Default values of user profile fields are not filled in correctly when shown by the UserList asset (Bernd Kalbfuß-Zimmerman)
- - fixed #9068: field.inTab
- - fixed #8845: Workflows refusing to show edit screen
- - fixed #4198: Namespace of Template "Newsletter (Manager)" set to "Collaboration
- - fixed #9106: Calendar Feed Workflow Creating Version Tags w/o Updates
- - fixed #8914: epoch for calendar/List View for Calendar
- - fixed #8822: Password Recovery Tempalte not working
- - fixed: DataForm times out when exporting large data sets
- - fixed: DataForm entry data field is too small
-
-
 7.6.3
  - improved performance of file uploads
  - changed format of created uploads locations, avoiding case sensitivity problems
diff --git a/lib/WebGUI/Form/HTMLArea.pm b/lib/WebGUI/Form/HTMLArea.pm
index b4c79e5df..ae2bd1d50 100644
--- a/lib/WebGUI/Form/HTMLArea.pm
+++ b/lib/WebGUI/Form/HTMLArea.pm
@@ -275,7 +275,7 @@ JS
         if ($child->isa('WebGUI::Asset::File::Image')) {
             $output .= '<a href="#" class="selectLink" onclick="selectImage(\''
                 . ($useAssetUrls ? $child->getUrl : $child->getFileUrl) . '\',\''
-                . $session->url->getSiteURL . $session->url->gateway($child->get('url'), 'op=formHelper;class=HTMLArea;sub=viewThumbnail')
+                . $session->url->gateway($child->get('url'), 'op=formHelper;class=HTMLArea;sub=viewThumbnail')
                 . '\'); return false;">[' . $i18n->get("select", 'WebGUI') . ']</a>';
         }
         else {