From 0e34bdfc1d1a36a9a332b6452cccb88d73661150 Mon Sep 17 00:00:00 2001
From: JT Smith <jt@plainblack.com>
Date: Tue, 16 Aug 2005 13:37:11 +0000
Subject: [PATCH] fixed the nasty logout bug

---
 docs/changelog/6.x.x.txt      | 1 +
 lib/WebGUI/Asset.pm           | 4 ++--
 lib/WebGUI/AssetVersioning.pm | 2 +-
 lib/WebGUI/Cache/FileCache.pm | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/docs/changelog/6.x.x.txt b/docs/changelog/6.x.x.txt
index cb12fc41f..f9af8c116 100644
--- a/docs/changelog/6.x.x.txt
+++ b/docs/changelog/6.x.x.txt
@@ -1,6 +1,7 @@
 6.7.1
  - Fixed a fatal error with Redirects
  - Fixed a fatal error in the date field in the new pluggable forms system.
+ - Fixed a nasty logout bug.
  - Fixed a fatal error in www_viewStatistics (mwilson)
  - Fixed some errors in FileCache.pm (mwilson)
  - Disabled killing of own session since it sometimes displays weird things
diff --git a/lib/WebGUI/Asset.pm b/lib/WebGUI/Asset.pm
index 048bef41b..4b0cfa823 100644
--- a/lib/WebGUI/Asset.pm
+++ b/lib/WebGUI/Asset.pm
@@ -932,7 +932,7 @@ sub new {
 	my $revisionDate = shift;
 	unless ($revisionDate) {
 		($revisionDate) = WebGUI::SQL->quickArray("select max(revisionDate) from assetData where assetId="
-			.quote($assetId)." and status='approved' or tagId=".quote($session{scratch}{versionTag})." 
+			.quote($assetId)." and  (status='approved' or status='archived'  or tagId=".quote($session{scratch}{versionTag}).")
 			group by assetData.assetId order by assetData.revisionDate");
 	}
 	return undef unless ($revisionDate);
@@ -1053,7 +1053,7 @@ sub newByUrl {
 			where 
 				assetData.url=".quote($url)." and
 				(
-					assetData.status='approved' or
+					assetData.status='approved' or assetData.status='archived' or
 					assetData.tagId=".quote($session{scratch}{versionTag})."
 				)
 			group by
diff --git a/lib/WebGUI/AssetVersioning.pm b/lib/WebGUI/AssetVersioning.pm
index 943bc2f3f..e365ece5b 100644
--- a/lib/WebGUI/AssetVersioning.pm
+++ b/lib/WebGUI/AssetVersioning.pm
@@ -131,7 +131,7 @@ Returns the number of revisions available for this asset.
 
 =head3 status
 
-Optionally specify to get the count based upon the status of the revisions. Options are "approved", "pending", "denied". Defaults to any status.
+Optionally specify to get the count based upon the status of the revisions. Options are "approved", "archived", "pending", "denied". Defaults to any status.
 
 =cut
 
diff --git a/lib/WebGUI/Cache/FileCache.pm b/lib/WebGUI/Cache/FileCache.pm
index 289cf0180..64fb84b12 100644
--- a/lib/WebGUI/Cache/FileCache.pm
+++ b/lib/WebGUI/Cache/FileCache.pm
@@ -161,7 +161,7 @@ sub getNamespaceSize {
         my $self = shift;
         my $expiresModifier = shift || 0;
         my $path = shift || $self->getNamespaceRoot;
-        my $filesRemaining = '0';
+        my $filesRemaining = 0;
         if (opendir(DIR,$path)) {
                 my @files = readdir(DIR);
                 foreach my $file (@files) {