From bc70ff498d73e0f38f749ea6cd28484ca1a05f83 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Fri, 18 Jun 2010 15:25:33 -0700
Subject: Use request::protocol()

---
 modules/gallery/helpers/MY_url.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'modules')

diff --git a/modules/gallery/helpers/MY_url.php b/modules/gallery/helpers/MY_url.php
index 57ce9623..877c5ada 100644
--- a/modules/gallery/helpers/MY_url.php
+++ b/modules/gallery/helpers/MY_url.php
@@ -70,8 +70,7 @@ class url extends url_Core {
    * Just like url::file() except that it returns an absolute URI
    */
   static function abs_file($path) {
-    return url::base(
-      false, (empty($_SERVER['HTTPS']) || $_SERVER['HTTPS'] === 'off') ? 'http' : 'https') . $path;
+    return url::base(false, request::protocol()) . $path;
   }
 
   /**
@@ -79,8 +78,7 @@ class url extends url_Core {
    * doesn't take a protocol parameter.
    */
   static function abs_site($path) {
-    return url::site(
-      $path, (empty($_SERVER['HTTPS']) || $_SERVER['HTTPS'] === 'off') ? 'http' : 'https');
+    return url::site($path, request::protocol());
   }
 
   /**
-- 
cgit v1.2.3