Merge branch 'master' into 0.9.x

2011-02-16 13:56:55 -05:00 · 2011-02-16 13:56:55 -05:00 · be682a3f8c
commit be682a3f8c
parent 07bc802867 39c6e34098
1 changed files with 8 additions and 0 deletions
--- a/lib/plugin.php
+++ b/lib/plugin.php
@ -162,6 +162,14 @@ class Plugin
            $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;