Merged in paulis/processmaker/HOR-2295 (pull request #5204)

HOR-2295
2016-11-25 19:54:40 +00:00
parent 01ed349faf 0696c711af
commit 57a1f252a0
2 changed files with 3 additions and 1 deletions
--- a/workflow/engine/bin/cron_single.php
+++ b/workflow/engine/bin/cron_single.php
@@ -176,6 +176,8 @@ try {
        }
        /*----------------------------------********---------------------------------*/
    }
+    global $sObject;
+    $sObject = $workspace;

    //Workflow
    saveLog('main', 'action', 'checking folder ' . PATH_DB . $workspace);
--- a/workflow/engine/src/ProcessMaker/BusinessModel/TimerEvent.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/TimerEvent.php
@@ -1138,7 +1138,7 @@ class TimerEvent
     *
     * return void
     */
-    private function log($action, $value = "", $status = "timereventcron")
+    private function log($action, $value = "", $status = "action")
    {
        try {
            $workspace = (defined("SYS_SYS"))? SYS_SYS : "Wokspace Undefined";