Merge remote-tracking branch 'upstream/master'

2013-05-06 10:17:14 -04:00
parent 1cbcbd7922 9bdaf7b2e9
commit 2bae6d540b
14 changed files with 69 additions and 42 deletions
--- a/workflow/engine/classes/class.processMap.php
+++ b/workflow/engine/classes/class.processMap.php
@@ -2137,6 +2137,8 @@ class processMap
        try {
            $oProcess = new Process();
            $aFields = $oProcess->load($sProcessUID);
+            $partnerFlag = (defined('PARTNER_FLAG')) ? PARTNER_FLAG : false;
+            $aFields['PARTNER_FLAG'] = $partnerFlag;
            global $G_PUBLISH;
            $G_PUBLISH = new Publisher();
            $G_PUBLISH->AddContent('propeltable', 'paged-table', 'triggers/triggers_ShortList', $this->getTriggersCriteria($sProcessUID), $aFields);