check local/plugins before plugins in Plugin::onAutoload

diff --git a/lib/plugin.php b/lib/plugin.php
index 605a4d12b5a9da0a450daa74d17dc3148c86216a..5acdc1c2ba5e076be788deb9206010767be1606a 100644 (file)
--- a/lib/plugin.php
+++ b/lib/plugin.php
@@ -99,7 +99,11 @@ class Plugin
      */
     public function onAutoload($cls) {
         $cls = basename($cls);
-        $basedir = INSTALLDIR . '/plugins/' . mb_substr(get_called_class(), 0, -6);
+        $basedir = INSTALLDIR . '/local/plugins/' . mb_substr(get_called_class(), 0, -6);
+        if (!file_exists($basedir)) {
+            $basedir = INSTALLDIR . '/plugins/' . mb_substr(get_called_class(), 0, -6);
+        }
+
         $file = null;
 
         if (preg_match('/^(\w+)(Action|Form)$/', $cls, $type)) {