fernando/luos
1
0
Fork 0
Code Releases Activity

Fixing conflicts

Browse Source
This commit is contained in:
Jenny Murillo
2016-03-22 09:39:38 -04:00
parent 7247ff3b16
commit 8b16de2179
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
workflow/engine/classes/class.AppDocumentDrive.php
View File

@@ -312,7 +312,6 @@ class AppDocumentDrive
$sw_file_exists = false; $sw_file_exists = false;
$realPath = ''; $realPath = '';
if ($appDoc->getAppDocType() === 'OUTPUT') { if ($appDoc->getAppDocType() === 'OUTPUT') {
//$name = substr($name, 1, -1);
$realPathDoc = PATH_DOCUMENT . $appUid . '/outdocs/' . $appDocUid . '_' . $docVersion . '.' . 'doc'; $realPathDoc = PATH_DOCUMENT . $appUid . '/outdocs/' . $appDocUid . '_' . $docVersion . '.' . 'doc';
$realPathDoc1 = PATH_DOCUMENT . $appUid . '/outdocs/' . $name . '_' . $docVersion . '.' . 'doc'; $realPathDoc1 = PATH_DOCUMENT . $appUid . '/outdocs/' . $name . '_' . $docVersion . '.' . 'doc';
$realPathDoc2 = PATH_DOCUMENT . $appUid . '/outdocs/' . $name . '.' . 'doc'; $realPathDoc2 = PATH_DOCUMENT . $appUid . '/outdocs/' . $name . '.' . 'doc';

3
workflow/engine/src/ProcessMaker/BusinessModel/Pmgmail.php
View File

@@ -357,4 +357,5 @@ class Pmgmail {
$oLabels = new \labelsGmail(); $oLabels = new \labelsGmail();
$oResponse = $oLabels->setLabelsToUnpauseCase($appUid, $appDelIndex); $oResponse = $oLabels->setLabelsToUnpauseCase($appUid, $appDelIndex);
} }
} }