Merged in julceslau/processmaker/HOR-1704 (pull request #4822)

HOR-1704
This commit is contained in:
Julio Cesar Laura Avendaño
2016-08-26 16:46:01 -04:00
2 changed files with 4 additions and 8 deletions

View File

@@ -32,8 +32,7 @@ class PMXPublisher
if (strlen(basename($outputFile)) >= $limit) {
$lastPos = strrpos(basename($outputFile), '.');
$fileName = substr(basename($outputFile), 0, $lastPos);
$newFileName = str_replace(".", "_", $fileName);
$newFileName = str_replace(" ", "_", $fileName);
$newFileName = \G::inflect($fileName);
$excess = strlen($newFileName) - $limit;
$newFileName = substr($newFileName, 0, strlen($newFileName) - $excess);
$newOutputFile = str_replace($fileName, $newFileName, $outputFile);
@@ -43,8 +42,7 @@ class PMXPublisher
$outputFile = $newOutputFile;
}
} else {
$outputFile = str_replace(".", "_", $outputFile);
$outputFile = str_replace(" ", "_", $outputFile);
$outputFile = \G::inflect($outputFile);
if (strlen($outputFile) >= $limit) {
$excess = strlen($outputFile) - $limit;
$newFileName = substr($outputFile, 0, strlen($outputFile) - $excess);

View File

@@ -167,8 +167,7 @@ class XmlExporter extends Exporter
if (strlen(basename($outputFile)) >= $limit) {
$lastPos = strrpos(basename($outputFile),'.');
$fileName = substr(basename($outputFile),0,$lastPos);
$newFileName = str_replace(".","_",$fileName);
$newFileName = str_replace(" ","_",$fileName);
$newFileName = \G::inflect($fileName);
$excess = strlen($newFileName) - $limit;
$newFileName = substr($newFileName,0,strlen($newFileName)-$excess);
$newOutputFile = str_replace($fileName,$newFileName,$outputFile);
@@ -178,8 +177,7 @@ class XmlExporter extends Exporter
$outputFile = $newOutputFile;
}
} else {
$outputFile = str_replace(".","_",$outputFile);
$outputFile = str_replace(" ","_",$outputFile);
$outputFile = \G::inflect($outputFile);
if (strlen($outputFile) >= $limit) {
$excess = strlen($outputFile) - $limit;
$newFileName = substr($outputFile,0,strlen($outputFile)-$excess);