From 5d0fc619857ba434e4a79aa6cc1773bfbeb51e62 Mon Sep 17 00:00:00 2001
From: davidcallizaya <david.callizaya@processmaker.com>
Date: Fri, 10 Jun 2016 16:22:56 -0400
Subject: [PATCH] HOR-1249 Plugin's end points routes aren't generated when
 disabling/enabling a plugin. c Fix routes path c Fix Fix class loader
 multiple classes c Fix plugin.singleton serialization

---
 framework/src/Maveriks/Util/ClassLoader.php      | 2 +-
 framework/src/Maveriks/WebApplication.php        | 3 ++-
 workflow/engine/classes/class.pluginRegistry.php | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/framework/src/Maveriks/Util/ClassLoader.php b/framework/src/Maveriks/Util/ClassLoader.php
index 336451df4..56ca7bbf2 100644
--- a/framework/src/Maveriks/Util/ClassLoader.php
+++ b/framework/src/Maveriks/Util/ClassLoader.php
@@ -88,7 +88,7 @@ class ClassLoader
 
             if (isset(self::$includePathNs[$mainNs])) {
                 if (file_exists(self::$includePathNs[$mainNs] . $classPath . ".php")) {
-                    require self::$includePathNs[$mainNs] . $classPath . ".php";
+                    require_once self::$includePathNs[$mainNs] . $classPath . ".php";
                     return true;
                 } else {
                     return false;
diff --git a/framework/src/Maveriks/WebApplication.php b/framework/src/Maveriks/WebApplication.php
index 8d5020a1b..c6bb33c7f 100644
--- a/framework/src/Maveriks/WebApplication.php
+++ b/framework/src/Maveriks/WebApplication.php
@@ -279,7 +279,7 @@ class WebApplication
 
         // Setting current workspace to Api class
         Services\Api::setWorkspace(SYS_SYS);
-        $cacheDir = defined("PATH_C")? PATH_C: sys_get_temp_dir();
+        $cacheDir = defined("PATH_WORKSPACE") ? PATH_WORKSPACE : (defined("PATH_C")? PATH_C: sys_get_temp_dir());
 
         $sysConfig = \System::getSystemConfiguration();
 
@@ -602,6 +602,7 @@ class WebApplication
     public static function purgeRestApiCache($workspace)
     {
         @unlink(PATH_DATA . 'compiled' . DS . 'routes.php');
+        @unlink(PATH_DATA_SITE . 'routes.php');
         @unlink(PATH_DATA . 'sites' . DS . $workspace . DS . 'api-config.php');
     }
 }
diff --git a/workflow/engine/classes/class.pluginRegistry.php b/workflow/engine/classes/class.pluginRegistry.php
index fcb4aafd5..a565afa26 100755
--- a/workflow/engine/classes/class.pluginRegistry.php
+++ b/workflow/engine/classes/class.pluginRegistry.php
@@ -169,7 +169,7 @@ class PMPluginRegistry
      */
     public function serializeInstance ()
     {
-        return serialize( self::$instance );
+        return serialize( $this );
     }
 
     /**