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

This commit is contained in:
Evan Prodromou 2011-02-11 15:58:47 -05:00
parent dc424ab63a
commit f6e614b894
3 changed files with 7 additions and 1 deletions

1
README
View File

@ -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 path: Path to the plugin files. defaults to site/path + '/plugins/'. Expects that
each plugin will have a subdirectory at plugins/NameOfPlugin. Change this each plugin will have a subdirectory at plugins/NameOfPlugin. Change this
if you're using a CDN. if you're using a CDN.
sslpath: Path to use on the SSL server. Same as plugins/path.
Plugins Plugins
======= =======

View File

@ -317,6 +317,7 @@ $default =
'server' => null, 'server' => null,
'sslserver' => null, 'sslserver' => null,
'path' => null, 'path' => null,
'sslpath' => null,
), ),
'admin' => 'admin' =>
array('panels' => array('design', 'site', 'user', 'paths', 'access', 'sessions', 'sitenotice', 'license')), array('panels' => array('design', 'site', 'user', 'paths', 'access', 'sessions', 'sitenotice', 'license')),

View File

@ -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)) { if (empty($path)) {
$path = common_config('site', 'path') . '/plugins/'; $path = common_config('site', 'path') . '/plugins/';