*/
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)) {
. ' (' . get_class($this) . ' v' . $this->version() . ')';
}
- function onPluginVersion(&$versions)
+ function onPluginVersion(array &$versions)
{
$name = $this->name();
static function staticPath($plugin, $relative)
{
- $isHTTPS = StatusNet::isHTTPS();
+ $isHTTPS = GNUsocial::isHTTPS();
if ($isHTTPS) {
$server = common_config('plugins', 'sslserver');