Merge remote-tracking branch 'origin/release/3.3.9' into bugfix/PMC-580

2019-05-07 14:47:01 -04:00
parent ca8a914aa3 34723302ca
commit 5486bbb027
32 changed files with 453 additions and 321 deletions
--- a/workflow/engine/classes/model/AppMessage.php
+++ b/workflow/engine/classes/model/AppMessage.php
@@ -160,7 +160,7 @@ class AppMessage extends BaseAppMessage
     * @param string $appMsgTemplate,
     * @param string $appMsgAttach,
     * @param string $appMsgStatus,
-     * @param string $appMsgShowMsg,
+     * @param integer $appMsgShowMsg,
     * @param string $appMsgError,
     * @param boolean $contentTypeIsHtml
     * @param integer $appNumber,
@@ -183,7 +183,7 @@ class AppMessage extends BaseAppMessage
        $appMsgTemplate = '',
        $appMsgAttach = '',
        $appMsgStatus = 'pending',
-        $appMsgShowMsg = '',
+        $appMsgShowMsg = 1,
        $appMsgError = '',
        $contentTypeIsHtml = true,
        $appNumber = 0,