wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

correctly use sslserver if it is set

Browse Source
This commit is contained in:
Evan Prodromou 2010-10-14 01:35:11 -04:00
parent 7fb765b2cb
commit 97a7fb246c
3 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
classes/Design.php
View File

@ -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;

7
lib/htmloutputter.php
View File

@ -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;

7
lib/theme.php
View File

@ -121,7 +121,12 @@ class Theme
$sslserver = common_config($group, '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') . '/';
if ($fallbackSubdir) {
$path .= $fallbackSubdir . '/';