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

diff --git a/README b/README
index f290ef424491eca898f761bcc461db684d39e3be..c27182395c2d11adedccf76e86ac4e05fbf9db57 100644 (file)
--- a/README
+++ b/README
@@ -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
 =======

diff --git a/lib/default.php b/lib/default.php
index 7d8b1fec7a45460ed804ca4e4cba1661727b9221..124c90c9983df0a2a9668869030861348c7354a9 100644 (file)
--- a/lib/default.php
+++ b/lib/default.php
@@ -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')),

diff --git a/lib/plugin.php b/lib/plugin.php
index 115bb10e01247c206808ccb5943aaa3aa92a1c04..1ccf23a0952d1bce36125a7c7e0ef7d0ab08ed01 100644 (file)
--- a/lib/plugin.php
+++ b/lib/plugin.php
@@ -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/';