From: Evan Prodromou <evan@status.net>
Date: Thu, 11 Feb 2010 21:42:58 +0000 (-0500)
Subject: Themes can be served from an SSL server
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=a6ab9c4a3e820b9d293075b1fec8b5eb05df87e9;p=quix0rs-gnu-social.git

Themes can be served from an SSL server
---

diff --git a/lib/default.php b/lib/default.php
index bf4b83718d..1a2cc4cf6d 100644
--- a/lib/default.php
+++ b/lib/default.php
@@ -123,7 +123,8 @@ $default =
         'theme' =>
         array('server' => null,
               'dir' => null,
-              'path'=> null),
+              'path'=> null,
+              'ssl' => false),
         'javascript' =>
         array('server' => null,
               'path'=> null),
diff --git a/lib/theme.php b/lib/theme.php
index 020ce1ac40..bed631d9c0 100644
--- a/lib/theme.php
+++ b/lib/theme.php
@@ -110,9 +110,9 @@ class Theme
                 $server = common_config('site', 'server');
             }
 
-            // XXX: protocol
+            $protocol = common_config('theme', 'ssl') ? 'https' : 'http';
 
-            $this->path = 'http://'.$server.$path.$name;
+            $this->path = $protocol . '://'.$server.$path.$name;
         }
     }