From 9efedfc2179e4e4d1476be6b9276f7e4889b8a8a Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Wed, 9 Feb 2011 00:04:01 -0800 Subject: [PATCH 1/2] Tweak to use site/server fallback when no plugins/sslserver or site/sslserver and generating plugin CSS --- lib/plugin.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/plugin.php b/lib/plugin.php index 1ca5deb5c5..2b34834577 100644 --- a/lib/plugin.php +++ b/lib/plugin.php @@ -146,7 +146,8 @@ class Plugin if (is_null($server)) { if ($isHTTPS) { $server = common_config('site', 'sslserver'); - } else { + } + if (is_null($server)) { $server = common_config('site', 'server'); } } From dc5daa237e8d691ca9be85da3ab883b00cee74e1 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Wed, 9 Feb 2011 00:09:25 -0800 Subject: [PATCH 2/2] Further tweak for ssl paths in plugin check (sslserver may be set but empty) --- lib/plugin.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/plugin.php b/lib/plugin.php index 2b34834577..115bb10e01 100644 --- a/lib/plugin.php +++ b/lib/plugin.php @@ -143,18 +143,18 @@ class Plugin $server = common_config('plugins', 'server'); } - if (is_null($server)) { + if (empty($server)) { if ($isHTTPS) { $server = common_config('site', 'sslserver'); } - if (is_null($server)) { + if (empty($server)) { $server = common_config('site', 'server'); } } $path = common_config('plugins', 'path'); - if (is_null($path)) { + if (empty($path)) { $path = common_config('site', 'path') . '/plugins/'; }