fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of git://github.com/ralpheav/processmaker into ralpheav-master

Browse Source
This commit is contained in:
Julio Cesar Laura
2013-05-08 10:35:00 -04:00
parent a235a3fc44 2bae6d540b
commit 5592db685d
22 changed files with 362 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
workflow/engine/classes/model/AppFolder.php
View File

@@ -434,7 +434,7 @@ class AppFolder extends BaseAppFolder
$info = pathinfo($oAppDocument->getAppDocFilename());
$version = (!empty($docVersion))? "_" . $docVersion : "_1";
$outDocPath = PATH_DOCUMENT . $row1["APP_UID"] . PATH_SEP . "outdocs" . PATH_SEP;
$outDocPath = PATH_DOCUMENT . G::getPathFromUID($row1["APP_UID"]) . PATH_SEP . "outdocs" . PATH_SEP;
if (file_exists($outDocPath . $appDocUid . $version . ".pdf") ||
file_exists($outDocPath . $info["basename"] . $version . ".pdf") ||

8
workflow/engine/classes/model/Translation.php
View File

@@ -177,8 +177,12 @@ class Translation extends BaseTranslation
//$json = new Services_JSON(); DEPRECATED
$f = fopen( $cacheFileJS, 'w' );
fwrite( $f, "var G_STRINGS =" . Bootstrap::json_encode( $translationJS ) . ";\n" );
fclose( $f );
if ($f==false) {
echo "Error: Cannot write into cachefilejs: $cacheFileJS\n";
} else {
fwrite( $f, "var G_STRINGS =" . Bootstrap::json_encode( $translationJS ) . ";\n" );
fclose( $f );
}
$res['cacheFile'] = $cacheFile;
$res['cacheFileJS'] = $cacheFileJS;