fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix in login and pluginregistry

Browse Source
This commit is contained in:
dev-ronald
2017-07-24 16:29:18 -04:00
committed by Ronald Quenta
parent 519e9e477f
commit c979a43d36
6 changed files with 48 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
framework/src/Maveriks/WebApplication.php
View File

@@ -358,7 +358,7 @@ class WebApplication
}
// hook to get rest api classes from plugins
if (class_exists('PMPluginRegistry') && file_exists(PATH_DATA_SITE . 'plugin.singleton')) {
if (class_exists('PMPluginRegistry')) {
$pluginRegistry = \PMPluginRegistry::loadSingleton(PATH_DATA_SITE . 'plugin.singleton');
$plugins = $pluginRegistry->getRegisteredRestServices();
@@ -370,8 +370,9 @@ class WebApplication
$loader->add($pluginSourceDir);
foreach ($plugin as $class) {
if (class_exists($class['namespace'])) {
$this->rest->addAPIClass($class['namespace'], strtolower($pluginName));
$className = is_object($class) ? $class->namespace: $class['namespace'];
if (class_exists($className)) {
$this->rest->addAPIClass($className, strtolower($pluginName));
}
}
}