From da580b77a0cf8e23cfab023b53034fabe5827d3f Mon Sep 17 00:00:00 2001
From: JT Smith <jt@plainblack.com>
Date: Tue, 1 Mar 2005 23:39:04 +0000
Subject: [PATCH] bug fixes

---
 docs/changelog/6.x.x.txt    |  1 +
 lib/WebGUI/Asset/Wobject.pm | 10 +++++-----
 lib/WebGUI/URL.pm           |  3 +--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/docs/changelog/6.x.x.txt b/docs/changelog/6.x.x.txt
index e9d2de7c6..51e86f36a 100644
--- a/docs/changelog/6.x.x.txt
+++ b/docs/changelog/6.x.x.txt
@@ -3,6 +3,7 @@
  - Added all sorts of caching to increase performance.
  - Fixed resetting votes on Poll would crash it.
  - Fixed not being able to set display title and other yes no questions to no.
+ - Fixed a bug where URLs would become unreachable when using SSL.
 
 
 6.3.0
diff --git a/lib/WebGUI/Asset/Wobject.pm b/lib/WebGUI/Asset/Wobject.pm
index 757976afc..b48c17fba 100644
--- a/lib/WebGUI/Asset/Wobject.pm
+++ b/lib/WebGUI/Asset/Wobject.pm
@@ -572,10 +572,10 @@ sub www_view {
 		) && 
 		not $session{var}{adminOn}
 	);
-#	if ($useCache) {
- #              	$cache = WebGUI::Cache->new("asset_".$self->getId."_".$session{user}{userId});
-  #         	$output = $cache->get;
-#	}
+	if ($useCache) {
+               	$cache = WebGUI::Cache->new("wobject_".$self->getId."_".$session{user}{userId});
+           	$output = $cache->get;
+	}
 	unless ($output) {
 		$output = $self->processStyle($self->view);
 		my $ttl;
@@ -584,7 +584,7 @@ sub www_view {
 		} else {
 			$ttl = $self->get("cacheTimeout");
 		}
-#		$cache->set($output, $ttl) if ($useCache && !WebGUI::HTTP::isRedirect());
+		$cache->set($output, $ttl) if ($useCache && !WebGUI::HTTP::isRedirect());
 	}
 	return $output;
 }
diff --git a/lib/WebGUI/URL.pm b/lib/WebGUI/URL.pm
index f3ae62d16..25cd55c49 100644
--- a/lib/WebGUI/URL.pm
+++ b/lib/WebGUI/URL.pm
@@ -256,9 +256,8 @@ sub page {
         my $url;
         if ($useFullUrl) {
                 $url = getSiteURL();
-        } else {
-                $url = getScriptURL();
         }
+        $url .= getScriptURL();
        	my $pathinfo = $session{env}{PATH_INFO};
 	$pathinfo =~ s/^\/(.*)/$1/;
         $url .= $pathinfo;