Merge remote-tracking branch 'upstream/master'

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

diff --git a/lib/plugin.php b/lib/plugin.php
index 9427827eda04c3b6c4d06aba3038d05a9f637e4e..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);