X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Fplugin.php;h=0e8c0a742d92f4deb25a35a7da2bfc01f45d04ed;hb=4cdb3e64ccd98953dc4477aa2ca9f0bcab7fcec6;hp=1ca5deb5c5e08297448608856c94823b382ddb36;hpb=f06e661a9bd2cde41c9974896bb5f819469dad14;p=quix0rs-gnu-social.git

diff --git a/lib/plugin.php b/lib/plugin.php
index 1ca5deb5c5..0e8c0a742d 100644
--- a/lib/plugin.php
+++ b/lib/plugin.php
@@ -143,20 +143,33 @@ class Plugin
             $server = common_config('plugins', 'server');
         }
 
-        if (is_null($server)) {
+        if (empty($server)) {
             if ($isHTTPS) {
                 $server = common_config('site', 'sslserver');
-            } else {
+            }
+            if (empty($server)) {
                 $server = common_config('site', 'server');
             }
         }
 
-        $path = common_config('plugins', 'path');
+        if ($isHTTPS) {
+            $path = common_config('plugins', 'sslpath');
+        } else {
+            $path = common_config('plugins', 'path');
+        }
 
-        if (is_null($path)) {
+        if (empty($path)) {
             $path = common_config('site', 'path') . '/plugins/';
         }
 
+        if ($path[strlen($path)-1] != '/') {
+            $path .= '/';
+        }
+
+        if ($path[0] != '/') {
+            $path = '/'.$path;
+        }
+
         $protocol = ($isHTTPS) ? 'https' : 'http';
 
         return $protocol.'://'.$server.$path.$plugin.'/'.$relative;