Notices start saving selfLink from activities/objects

[quix0rs-gnu-social.git] / lib / plugin.php

diff --git a/lib/plugin.php b/lib/plugin.php
index 28040d3f84f22e1faad9348f7e93faf0c5e7cd6e..04df51f824206a843e12257d168a249bbe3e6222 100644 (file)
--- 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;
     }