From 662c43ca21deb039c749be74d9b4820d4f9c9ca0 Mon Sep 17 00:00:00 2001
From: Colin Kuskie <colink@perldreamer.com>
Date: Wed, 8 Feb 2006 21:04:02 +0000
Subject: [PATCH] forward port of bug fixes and POD upgrade

---
 docs/changelog/6.x.x.txt             | 2 ++
 lib/WebGUI/Asset/FilePile.pm         | 2 +-
 lib/WebGUI/Commerce/Item.pm          | 8 ++++----
 www/extras/slidePanel/slidePanel.css | 3 ++-
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/docs/changelog/6.x.x.txt b/docs/changelog/6.x.x.txt
index d1467775d..dc7a17351 100644
--- a/docs/changelog/6.x.x.txt
+++ b/docs/changelog/6.x.x.txt
@@ -30,6 +30,8 @@
  - fix [ 1421056 ] LDAP Recursive Property Bug
  - fix [ 1404350 ] no hoverHelp for InOutBoard
  - fix [ 1410127 ] User profile fields do not display value \'0\'
+ - fix [ 1427600 ] Prevent Proxy caching on - URL issue
+ - fix [ 1413032 ] AdminBar text unreadable in some cases. w/ fix
 
 6.8.5
  - fix [ 1396957 ] Insufficient privileges check on the DataForm
diff --git a/lib/WebGUI/Asset/FilePile.pm b/lib/WebGUI/Asset/FilePile.pm
index d0c1ac093..b8690cca9 100644
--- a/lib/WebGUI/Asset/FilePile.pm
+++ b/lib/WebGUI/Asset/FilePile.pm
@@ -173,7 +173,7 @@ sub editSave {
 		$data{filename} = $data{title} = $data{menuTitle} = $filename;
 		$data{templateId} = 'PBtmpl0000000000000024';
 		$data{templateId} = 'PBtmpl0000000000000088' if ($selfName eq  "WebGUI::Asset::File::Image");
-		$data{url} = $self->getParent->getUrl.'/'.$filename;
+		$data{url} = $self->getParent->get('url').'/'.$filename;
 		my $newAsset = $self->getParent->addChild(\%data);
 		delete $newAsset->{_storageLocation};
 		$newAsset->setSize($storage->getFileSize($filename));
diff --git a/lib/WebGUI/Commerce/Item.pm b/lib/WebGUI/Commerce/Item.pm
index 6279d679f..df1b8fc19 100644
--- a/lib/WebGUI/Commerce/Item.pm
+++ b/lib/WebGUI/Commerce/Item.pm
@@ -9,15 +9,15 @@ Package WebGUI::Commerce::Item
 This is the SUPER class off all Item plugins. Item plugins are an abstraction layer to connect
 arbitrary types of products and other stuff you might want to sell to the commerce system.
 
-The SUPER class new method provides an easy way to load Item plugins: WebGUI::Item->new($self->session,'1234', 'MyItem') 
-is equivalent to WebGUI::Item::MyItem->new($self->session,'1234'). The SUPER class new has the benefit of added
+The SUPER class new method provides an easy way to load Item plugins: WebGUI::Commerce::Item->new($self->session,'1234', 'MyItem') 
+is equivalent to WebGUI::Commerce::Item::MyItem->new($self->session,'1234'). The SUPER class new has the benefit of added
 error checking, so you should use this.
 
 
 =head1 SYNOPSIS
 
- use WebGUI::Item;
- $item = WebGUI::Item->new($self->session,$itemId, $itemType);
+ use WebGUI::Commerce::Item;
+ $item = WebGUI::Commerce::Item->new($self->session,$itemId, $itemType);
 
  $description = $item->description;
  $duration = $item->duration;
diff --git a/www/extras/slidePanel/slidePanel.css b/www/extras/slidePanel/slidePanel.css
index 09c940009..e4f94c9a9 100644
--- a/www/extras/slidePanel/slidePanel.css
+++ b/www/extras/slidePanel/slidePanel.css
@@ -53,8 +53,9 @@
 	position:absolute; 
 	left:0px;
 	background-color: #eeeeee;
-		background-image: url(panel_bg.jpg);
+	background-image: url(panel_bg.jpg);
 	background-repeat: repeat-x;
+	color: black;
 }
 
 .panelLinkOut {