Commit f6e614b8 authored by Evan Prodromou's avatar Evan Prodromou

add plugins/sslpath setting, default to site path/plugins

parent dc424ab6
......@@ -1588,6 +1588,7 @@ sslserver: Server to find static files for a plugin when the page is HTTPS. Defa
path: Path to the plugin files. defaults to site/path + '/plugins/'. Expects that
each plugin will have a subdirectory at plugins/NameOfPlugin. Change this
if you're using a CDN.
sslpath: Path to use on the SSL server. Same as plugins/path.
Plugins
=======
......
......@@ -317,6 +317,7 @@ $default =
'server' => null,
'sslserver' => null,
'path' => null,
'sslpath' => null,
),
'admin' =>
array('panels' => array('design', 'site', 'user', 'paths', 'access', 'sessions', 'sitenotice', 'license')),
......
......@@ -152,7 +152,11 @@ class Plugin
}
}
$path = common_config('plugins', 'path');
if ($isHTTPS) {
$path = common_config('plugins', 'sslpath');
} else {
$path = common_config('plugins', 'path');
}
if (empty($path)) {
$path = common_config('site', 'path') . '/plugins/';
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment