fernando/luos
1
0
Fork 0
Code Releases Activity

Merge branch 'develop' of https://bitbucket.org/colosa/processmaker into feature/PMCORE-1444

Browse Source
This commit is contained in:
Henry Jordan
2020-06-11 16:35:13 +00:00
parent 00d03dc450 f75d407041
commit fac9a1e8de
29 changed files with 977 additions and 280 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
workflow/engine/src/ProcessMaker/Core/Installer.php
View File

@@ -376,9 +376,7 @@ class Installer
}
//ACTIVE ENTERPRISE
ini_set('max_execution_time', '0');
ini_set('memory_limit', '256M');
$serv = 'http://';
if (isset($_SERVER['HTTPS']) && trim($_SERVER['HTTPS']) != '') {

1
workflow/engine/src/ProcessMaker/Core/System.php
View File

@@ -36,7 +36,6 @@ class System
'debug_time' => 0,
'debug_calendar' => 0,
'wsdl_cache' => 1,
'memory_limit' => "256M",
'time_zone' => 'America/New_York',
'expiration_year' => '1',
'memcached' => 0,

32
workflow/engine/src/ProcessMaker/Util/WsMessageResponse.php
View File

@@ -1,32 +0,0 @@
<?php
namespace ProcessMaker\Util;
use WsResponse;
class WsMessageResponse extends WsResponse
{
private $appMessUid = null;
/**
* Get the appMessUid
*
* @return array
*/
public function getAppMessUid()
{
return $this->appMessUid;
}
/**
* Set the appMessUid
*
* @param string $v
* @return void
*/
public function setAppMessUid($v)
{
$this->appMessUid = $v;
}
}