Merge branch 'master' of https://github.com/easysoft/zentaopms

2018-07-03 14:16:41 +08:00
parent ac36781aa5 783c05a2a2
commit 7712dd4eab
2 changed files with 2 additions and 1 deletions
@@ -613,6 +613,7 @@ class fileModel extends model
     */
    private function removeInterference($matchs)
    {
+        if(strlen($matchs[1]) % 2 == 1) return $matchs[1] . $matchs[2];
        return str_replace('""', '"', $matchs[1]) . str_replace(',', '&comma;', $matchs[2]);
    }

@@ -498,7 +498,7 @@ class todoModel extends model
                {
                    $newTodo->date = $newDate;
                    $this->dao->insert(TABLE_TODO)->data($newTodo)->exec();
-                    $this->action->create('todo', $this->dao->lastInsertID(), 'opened');
+                    $this->action->create('todo', $this->dao->lastInsertID(), 'opened', '', '', $newTodo->account);
                    $lastCycleList[$todo->id] = $newTodo;
                }
            }