git.gnu.io has moved to IP address 209.51.188.249 -- please double check where you are logging in.

Commit dcf29c2a authored by mmn's avatar mmn

s/isHTTPS/useHTTPS/ for HTTPS URL generation

parent eaa394ed
......@@ -199,16 +199,14 @@ class Plugin
static function staticPath($plugin, $relative)
{
$isHTTPS = GNUsocial::isHTTPS();
if ($isHTTPS) {
if (GNUsocial::useHTTPS()) {
$server = common_config('plugins', 'sslserver');
} else {
$server = common_config('plugins', 'server');
}
if (empty($server)) {
if ($isHTTPS) {
if (GNUsocial::useHTTPS()) {
$server = common_config('site', 'sslserver');
}
if (empty($server)) {
......@@ -216,7 +214,7 @@ class Plugin
}
}
if ($isHTTPS) {
if (GNUsocial::useHTTPS()) {
$path = common_config('plugins', 'sslpath');
} else {
$path = common_config('plugins', 'path');
......@@ -239,7 +237,7 @@ class Plugin
$path = '/'.$path;
}
$protocol = ($isHTTPS) ? 'https' : 'http';
$protocol = GNUsocial::useHTTPS() ? 'https' : 'http';
return $protocol.'://'.$server.$path.$plugin.'/'.$relative;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment