eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'ssltweak'

Browse Source
This commit is contained in:
Brion Vibber
2011-02-09 00:11:28 -08:00
parent c273876298 dc5daa237e
commit 956b3ef4d1
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/plugin.php
View File

@@ -143,17 +143,18 @@ class Plugin
$server = common_config('plugins', 'server'); $server = common_config('plugins', 'server');
} }
if (is_null($server)) { if (empty($server)) {
if ($isHTTPS) { if ($isHTTPS) {
$server = common_config('site', 'sslserver'); $server = common_config('site', 'sslserver');
} else { }
if (empty($server)) {
$server = common_config('site', 'server'); $server = common_config('site', 'server');
} }
} }
$path = common_config('plugins', 'path'); $path = common_config('plugins', 'path');
if (is_null($path)) { if (empty($path)) {
$path = common_config('site', 'path') . '/plugins/'; $path = common_config('site', 'path') . '/plugins/';
} }