Misses this file to merge. I like the comments.

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

diff --git a/lib/plugin.php b/lib/plugin.php
index 5acdc1c2ba5e076be788deb9206010767be1606a..9427827eda04c3b6c4d06aba3038d05a9f637e4e 100644 (file)
--- a/lib/plugin.php
+++ b/lib/plugin.php
@@ -178,7 +178,7 @@ class Plugin
                 . ' (' . get_class($this) . ' v' . $this->version() . ')';
     }
 
-    function onPluginVersion(&$versions)
+    function onPluginVersion(array &$versions)
     {
         $name = $this->name();
 
@@ -196,7 +196,7 @@ class Plugin
 
     static function staticPath($plugin, $relative)
     {
-        $isHTTPS = StatusNet::isHTTPS();
+        $isHTTPS = GNUsocial::isHTTPS();
 
         if ($isHTTPS) {
             $server = common_config('plugins', 'sslserver');