Merge branch '2828' into 0.9.x

[quix0rs-gnu-social.git] / classes / Design.php

diff --git a/classes/Design.php b/classes/Design.php
index 50712ce8b550ab7577624bebd84cb1c798d5775a..a8fdb72191e861055bf527dda81c4dc7247f40c7 100644 (file)
--- a/classes/Design.php
+++ b/classes/Design.php
@@ -146,7 +146,12 @@ class Design extends Memcached_DataObject
             if (empty($sslserver)) {
                 // XXX: this assumes that background dir == site dir + /background/
                 // not true if there's another server
-                $server = common_config('site', 'server');
+                if (is_string(common_config('site', 'sslserver')) &&
+                    mb_strlen(common_config('site', 'sslserver')) > 0) {
+                    $server = common_config('site', 'sslserver');
+                } else if (common_config('site', 'server')) {
+                    $server = common_config('site', 'server');
+                }
                 $path   = common_config('site', 'path') . '/background/';
             } else {
                 $server = $sslserver;