From 20e496d0024a715310660cbb157a71e66e88b544 Mon Sep 17 00:00:00 2001
From: Graham Knop <graham@plainblack.com>
Date: Tue, 13 Nov 2007 18:25:26 +0000
Subject: [PATCH] fix broken SSL redirection

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

diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index f37dc411c..d191cb6fa 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -10,6 +10,7 @@
 
 7.4.14
  - fix: CS posts won't allow new attachments after deleting an old one
+ - fix: SSL redirection broken
 
 7.4.13
  - fix: field_loop missing from SQL Form template
diff --git a/lib/WebGUI/Asset.pm b/lib/WebGUI/Asset.pm
index c61494ca0..0f6911887 100644
--- a/lib/WebGUI/Asset.pm
+++ b/lib/WebGUI/Asset.pm
@@ -275,8 +275,9 @@ sub checkView {
 	my $self = shift;
 	return $self->session->privilege->noAccess() unless $self->canView;
 	my ($conf, $env, $var, $http) = $self->session->quick(qw(config env var http));
-    if ($conf->get("sslEnabled") && $self->get("encryptPage") && $env->("HTTPS") ne "on" && !$env->get("SSLPROXY")) {
-        $http->setRedirect("https://".$conf->get("sitename")->[0].$self->getUrl);
+    if ($conf->get("sslEnabled") && $self->get("encryptPage") && $env->get("HTTPS") ne "on" && !$env->get("SSLPROXY")) {
+        # getUrl already changes url to https if 'encryptPage'
+        $http->setRedirect($self->getUrl);
         return "redirect";
 	}
     elsif ($var->isAdminOn && $self->get("state") =~ /^trash/) { # show em trash