From dc4fb07c1b7175a881751fa130adeabf76cc99ca Mon Sep 17 00:00:00 2001
From: JT Smith <jt@plainblack.com>
Date: Tue, 18 Apr 2006 01:00:26 +0000
Subject: [PATCH] various bug fixes

---
 docs/changelog/6.x.x.txt   |  5 +++++
 docs/upgrades/7fixup.pl    | 20 ++++++++++++++++++++
 lib/WebGUI/AdminConsole.pm |  4 ++--
 lib/WebGUI/Asset/Post.pm   |  8 ++------
 4 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/docs/changelog/6.x.x.txt b/docs/changelog/6.x.x.txt
index 0441d10be..a24ce86e0 100644
--- a/docs/changelog/6.x.x.txt
+++ b/docs/changelog/6.x.x.txt
@@ -100,6 +100,11 @@
  - fix [ 1410577 ] WebGUI::Session not included
  - fix a bug where a link was provided to become or delete non-existant users.
  - fix bugs with the in-memory session caching of user and group memberships
+ - fix [ 1465362 ] RichEditor doesn't work on Safari
+ - fix [ 1344665 ] Cache does not remember mimetype
+ - fix [ 1172613 ] Header Tag Not Accessibility Friendly
+ - fix [ 1340839 ] If can't use item in adminConsole don't display it
+
 
 6.8.8
  - fix [ 1452466 ] File size not set in File asset (Thanks to Eric S)
diff --git a/docs/upgrades/7fixup.pl b/docs/upgrades/7fixup.pl
index 307bbe0d8..533c03e05 100644
--- a/docs/upgrades/7fixup.pl
+++ b/docs/upgrades/7fixup.pl
@@ -16,11 +16,31 @@ $versionTag->set({name=>"Stuff just for 7.0 installs"});
 addPrototypes();
 rearrangeImportNode();
 addNewStyles();
+addRobots();
 $versionTag->commit;
 purgeOldRevisions();
 
 finish($session); # this line required
 
+#-------------------------------------------------
+sub addRobots {
+	print "\tAdding robots.txt file.\n";
+	my $importNode = WebGUI::Asset->getImportNode($session);
+	$importNode->addChild({
+		title=>"robots.txt",
+		menuTitle=>"robots.txt",
+		url=>"robots.txt",
+		groupIdView=>'7',
+		groupIdEdit=>'12',
+		className=>'WebGUI::Asset::Snippet',
+		assetId=>"new",
+		snippet=>'User-agent: googlebot
+Disallow: *?op=displayLogin
+Disallow: *?op=makePrintable
+'
+		},"pbrobot000000000000001");
+}
+
 
 #-------------------------------------------------
 sub addNewStyles {
diff --git a/lib/WebGUI/AdminConsole.pm b/lib/WebGUI/AdminConsole.pm
index a90129d6a..066f28b30 100644
--- a/lib/WebGUI/AdminConsole.pm
+++ b/lib/WebGUI/AdminConsole.pm
@@ -267,7 +267,7 @@ sub getAdminFunction {
 			},
 			icon=>"statistics.gif",
 			op=>"viewStatistics",
-			group=>"12"
+			group=>"3"
 		},
 		"contentProfiling"=>{
 			title=>{
@@ -285,7 +285,7 @@ sub getAdminFunction {
 			},
 			icon=>"contentFilters.gif",
 			op=>"listReplacements",
-			group=>"4"
+			group=>"3"
 		},
 		"userProfiling"=>{
 			title=>{
diff --git a/lib/WebGUI/Asset/Post.pm b/lib/WebGUI/Asset/Post.pm
index 93a35ef23..5bed25429 100644
--- a/lib/WebGUI/Asset/Post.pm
+++ b/lib/WebGUI/Asset/Post.pm
@@ -147,7 +147,7 @@ sub definition {
                 className=>'WebGUI::Asset::Post',
                 properties=>{
 			storageId => {
-				fieldType=>"file",
+				fieldType=>"image",
 				defaultValue=>undef
 				},
 			threadId => {
@@ -657,10 +657,6 @@ sub processPropertiesFromFormPost {
 		}
 	}
         $self->getThread->subscribe if ($self->session->form->process("subscribe"));
- 	delete $self->{_storageLocation};
-	my $storage = $self->getStorageLocation;
-	my $attachmentLimit = $self->getThread->getParent->get("attachmentsPerPost");
-	$storage->addFileFromFormPost("file", $attachmentLimit) if $attachmentLimit;
 	$self->postProcess;
 	$self->requestCommit;
 }
@@ -1040,7 +1036,7 @@ sub www_edit {
 	$var{'form.preview'} = WebGUI::Form::submit($self->session, {
 		value=>$i18n->get("preview","Asset_Collaboration")
 		});
-	$var{'attachment.form'} = WebGUI::Form::file($self->session, {
+	$var{'attachment.form'} = WebGUI::Form::image($self->session, {
 		value=>$self->get("storageId"),
 		maxAttachments=>$self->getThread->getParent->getValue("attachmentsPerPost"),
 		deleteFileUrl=>$self->getUrl("func=deleteFile;filename=")