Merged in gproly/processmaker/HOR-7 (pull request #3468)

HOR-7
2016-01-27 11:27:01 -04:00
parent cc8d4acbd7 1447ea8b43
commit bfd1d99739
2 changed files with 12 additions and 1 deletions
--- a/workflow/engine/classes/class.pluginRegistry.php
+++ b/workflow/engine/classes/class.pluginRegistry.php
@@ -1117,8 +1117,9 @@ class PMPluginRegistry
     */
    public function &getPlugin ($sNamespace)
    {
+        $oPlugin = null;
        if (array_key_exists( $sNamespace, $this->_aPlugins )) {
-            return $this->_aPlugins[$sNamespace];
+            $oPlugin = $this->_aPlugins[$sNamespace];
        }
        /*
        $aDetails = KTUtil::arrayGet($this->_aPluginDetails, $sNamespace);
@@ -1134,6 +1135,7 @@ class PMPluginRegistry
        $this->_aPlugins[$sNamespace] =& $oPlugin;
        return $oPlugin;
        */
+        return $oPlugin;
    }

    /**