Don't trust local HTML either

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

diff --git a/lib/plugin.php b/lib/plugin.php
index 5acdc1c2ba5e076be788deb9206010767be1606a..28040d3f84f22e1faad9348f7e93faf0c5e7cd6e 100644 (file)
--- a/lib/plugin.php
+++ b/lib/plugin.php
@@ -144,6 +144,9 @@ class Plugin
                 // @fixme this will fail for things installed in local/plugins
                 // ... but then so will web links so far.
                 $path = INSTALLDIR . "/plugins/$name/locale";
+                if (!file_exists($path)) {
+                    $path = INSTALLDIR . "/local/plugins/$name/locale";
+                }
             }
             if (file_exists($path) && is_dir($path)) {
                 bindtextdomain($name, $path);
@@ -178,7 +181,7 @@ class Plugin
                 . ' (' . get_class($this) . ' v' . $this->version() . ')';
     }
 
-    function onPluginVersion(&$versions)
+    function onPluginVersion(array &$versions)
     {
         $name = $this->name();
 
@@ -196,7 +199,7 @@ class Plugin
 
     static function staticPath($plugin, $relative)
     {
-        $isHTTPS = StatusNet::isHTTPS();
+        $isHTTPS = GNUsocial::isHTTPS();
 
         if ($isHTTPS) {
             $server = common_config('plugins', 'sslserver');