From dcf29c2a07c730cb79637672b7fab8db7360c27c Mon Sep 17 00:00:00 2001
From: Mikael Nordfeldth <mmn@hethane.se>
Date: Wed, 10 Feb 2016 00:38:14 +0100
Subject: [PATCH] s/isHTTPS/useHTTPS/ for HTTPS URL generation

---
 lib/plugin.php | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/lib/plugin.php b/lib/plugin.php
index 28040d3f84..04df51f824 100644
--- a/lib/plugin.php
+++ b/lib/plugin.php
@@ -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;
     }
-- 
2.39.5