Merge branch 'master' into 0.9.x

This commit is contained in:
Evan Prodromou 2011-02-16 13:56:55 -05:00
commit be682a3f8c

View File

@ -162,6 +162,14 @@ class Plugin
$path = common_config('site', 'path') . '/plugins/'; $path = common_config('site', 'path') . '/plugins/';
} }
if ($path[strlen($path)-1] != '/') {
$path .= '/';
}
if ($path[0] != '/') {
$path = '/'.$path;
}
$protocol = ($isHTTPS) ? 'https' : 'http'; $protocol = ($isHTTPS) ? 'https' : 'http';
return $protocol.'://'.$server.$path.$plugin.'/'.$relative; return $protocol.'://'.$server.$path.$plugin.'/'.$relative;