From: Evan Prodromou <evan@status.net>
Date: Thu, 11 Feb 2010 21:47:47 +0000 (-0500)
Subject: null theme ssl setting means 'guess'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=316ed3f86b60150d66460b478bf7146811bb6bb1;p=quix0rs-gnu-social.git

null theme ssl setting means 'guess'
---

diff --git a/README b/README
index 9b4147645b..2b021b36ca 100644
--- 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 bed631d9c0..0be8c3b9df 100644
--- 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;
         }