From daf02a4a91329931ff274abf53ae537f732c7bb2 Mon Sep 17 00:00:00 2001
From: JT Smith <jt@plainblack.com>
Date: Thu, 25 Mar 2004 20:51:13 +0000
Subject: [PATCH] bugfix [ 920089 ] Problem with clipboard and object names
 containing a quote

---
 docs/changelog/6.x.x.txt     | 2 ++
 lib/WebGUI/Macro/AdminBar.pm | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/docs/changelog/6.x.x.txt b/docs/changelog/6.x.x.txt
index 301e58899..2e8a207ae 100644
--- a/docs/changelog/6.x.x.txt
+++ b/docs/changelog/6.x.x.txt
@@ -17,6 +17,8 @@ Andreas Graf).
  - Bugfix [ 916538 ] Typo in lib/WebGUI/Auth.pm
  - Bugfix [ 917783 ] 6.0.0 Date Changes
  - Bugfix [ 914217 ] content managers cannot turn admin on
+ - Bugfix [ 920089 ] Problem with clipboard and object names containing a
+   quote.
 
 
 6.0.0
diff --git a/lib/WebGUI/Macro/AdminBar.pm b/lib/WebGUI/Macro/AdminBar.pm
index 18baf59ae..7839587b2 100644
--- a/lib/WebGUI/Macro/AdminBar.pm
+++ b/lib/WebGUI/Macro/AdminBar.pm
@@ -38,6 +38,7 @@ sub process {
 	my $i;
 	my $sth = WebGUI::SQL->read("select pageId,title from page where parentId=5");
         while (my %data = $sth->hash) {
+		$data{title} =~ s/'//g;
 		push(@packages, {
         		'package.url'=>WebGUI::URL::page('op=deployPackage&pid='.$data{pageId}),
                		'package.label'=>$data{title},
@@ -88,6 +89,7 @@ sub process {
 	}
         $r = WebGUI::SQL->read($query);
         while (%cphash = $r->hash) {
+		$cphash{title} =~ s/'//g;
 		push @item, [	$cphash{bufferDate},
 				WebGUI::URL::page('op=pastePage&pageId='.$cphash{pageId}),
 				$cphash{title} . ' ('. WebGUI::International::get(2) .')' ];
@@ -105,6 +107,7 @@ sub process {
 	}
         $r = WebGUI::SQL->read($query);
         while (%cphash = $r->hash) {
+		$cphash{title} =~ s/'//g;
 		push @item, [	$cphash{bufferDate},
 				WebGUI::URL::page('func=paste&wid='.$cphash{wobjectId}),
 				$cphash{title} . ' ('. $cphash{namespace} .')' ];