up observations

2017-08-04 09:32:25 -04:00
parent 6ca19b77c9
commit 651d22a71d
32 changed files with 145 additions and 82 deletions
--- a/framework/src/Maveriks/WebApplication.php
+++ b/framework/src/Maveriks/WebApplication.php
@@ -2,6 +2,7 @@
 namespace Maveriks;

 use Maveriks\Util;
+use ProcessMaker\Plugins\PluginRegistry;
 use ProcessMaker\Services;
 use ProcessMaker\Services\Api;
 use Luracast\Restler\RestException;
@@ -358,8 +359,8 @@ class WebApplication
        }

        // hook to get rest api classes from plugins
-        if (class_exists('PMPluginRegistry')) {
-            $pluginRegistry = \PMPluginRegistry::loadSingleton(PATH_DATA_SITE . 'plugin.singleton');
+        if (class_exists('ProcessMaker\Plugins\PluginRegistry')) {
+            $pluginRegistry = PluginRegistry::loadSingleton();
            $plugins = $pluginRegistry->getRegisteredRestServices();

            if (! empty($plugins)) {