Themes can be served from an SSL server

2 files changed, 4 insertions, 3 deletions

diff --git a/lib/default.php b/lib/default.php
index bf4b83718..1a2cc4cf6 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 020ce1ac4..bed631d9c 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;
         }
     }