GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Merge commit 'refs/merge-requests/6' of git://gitorious.org/statusnet/gnu-social into merge-requests/6

Browse Source
This commit is contained in:
Mikael Nordfeldth 2014-01-04 21:27:28 +01:00
commit 4759365293
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/plugin.php
View File

@ -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)) {