Themes can be served from an SSL server

diff --git a/lib/default.php b/lib/default.php
index bf4b83718d04dd4e934d626bbd31a30618e04c56..1a2cc4cf6d0b14b077e20d35e869138bc86e12b5 100644 (file)
--- 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 020ce1ac40cc77d7a57cd5e486ed3224973b1e5e..bed631d9c0ac54e37631a48a068a153e628d8a42 100644 (file)
--- 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;
         }
     }