Plugin::path() checks local/plugins/ first

diff --git a/lib/plugin.php b/lib/plugin.php
index 0e8c0a742d92f4deb25a35a7da2bfc01f45d04ed..a5424e06ca2ca6855349302544ab64939b639576 100644 (file)
--- a/lib/plugin.php
+++ b/lib/plugin.php
@@ -159,7 +159,12 @@ class Plugin
         }
 
         if (empty($path)) {
-            $path = common_config('site', 'path') . '/plugins/';
+            // XXX: extra stat().
+            if (@file_exists(INSTALLDIR.'/local/plugins/'.$plugin.'/'.$relative)) {
+                $path = common_config('site', 'path') . '/local/plugins/';
+            } else {
+                $path = common_config('site', 'path') . '/plugins/';
+            }
         }
 
         if ($path[strlen($path)-1] != '/') {