null theme ssl setting means 'guess'

diff --git a/README b/README
index 9b4147645b5fe1ce0f67a117480ad5f62402cbf2..2b021b36ca9140720fd1f6fc599bf45ee0f81836 100644 (file)
--- a/README
+++ b/README
@@ -1221,6 +1221,8 @@ path:     Path part of theme URLs, before the theme name. Relative to the
        (using version numbers as the path) to make sure that all files are
        reloaded by caching clients or proxies. Defaults to null,
        which means to use the site path + '/theme'.
+ssl:   Whether to use SSL for theme elements. Default is null, which means
+       guess based on site SSL settings.
 
 xmpp
 ----

diff --git a/lib/theme.php b/lib/theme.php
index bed631d9c0ac54e37631a48a068a153e628d8a42..0be8c3b9dfaa8ba2631bb67e08cbfb49b36ceb60 100644 (file)
--- a/lib/theme.php
+++ b/lib/theme.php
@@ -110,7 +110,18 @@ class Theme
                 $server = common_config('site', 'server');
             }
 
-            $protocol = common_config('theme', 'ssl') ? 'https' : 'http';
+            $ssl = common_config('theme', 'ssl');
+
+            if (is_null($ssl)) { // null -> guess
+                if (common_config('site', 'ssl') == 'always' &&
+                    !common_config('theme', 'server')) {
+                    $ssl = true;
+                } else {
+                    $ssl = false;
+                }
+            }
+
+            $protocol = ($ssl) ? 'https' : 'http';
 
             $this->path = $protocol . '://'.$server.$path.$name;
         }