correctly use sslserver if it is set

[quix0rs-gnu-social.git] / lib / htmloutputter.php

diff --git a/lib/htmloutputter.php b/lib/htmloutputter.php
index f01f1814f02b92a83b9620b5b5c4aded77a1a37d..4a1b7db472a9318dfc13a2802749cded898561dc 100644 (file)
--- a/lib/htmloutputter.php
+++ b/lib/htmloutputter.php
@@ -371,7 +371,12 @@ class HTMLOutputter extends XMLOutputter
                         $sslserver = common_config('javascript', 'sslserver');
 
                         if (empty($sslserver)) {
-                            $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') . '/js/';
                         } else {
                             $server = $sslserver;