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

Merged in gsilvasaire/processmaker/ALF-31 (pull request #4792)

Browse Source 
ALF-31
This commit is contained in:
Julio Cesar Laura Avendaño
2016-08-19 17:48:20 -04:00
parent 0b5b197d64 fcece888e5
commit 4ebca218fb
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
class.Build.php
View File

@@ -39,7 +39,7 @@ class ProcessMakerPhpBuilderHelper
* Build temporal directory * Build temporal directory
* @var string * @var string
*/ */
public $buildTempDir = "./workflow/buildTemp"; public $buildTempDir = "./shared/buildTemp";
/** /**
* Production directories * Production directories
* @var array * @var array
@@ -141,10 +141,11 @@ class ProcessMakerPhpBuilderHelper
} }
$this->baseDir = empty($config['base_dir']) ? $baseDir : $config['base_dir']; $this->baseDir = empty($config['base_dir']) ? $baseDir : $config['base_dir'];
$this->publicDir = $this->baseDir . "/workflow/public_html"; $this->publicDir = $this->baseDir . "/workflow/public_html";
$this->buildTempDir = $this->baseDir . "/workflow/buildTemp"; $this->buildTempDir = $this->baseDir . "/shared/buildTemp";
$this->logDir = $this->baseDir . "/shared/log"; $this->logDir = $this->baseDir . "/shared/log";
if (defined('PATH_DATA')) { if (defined('PATH_DATA')) {
$this->logDir = PATH_DATA . "log"; $this->logDir = PATH_DATA . "log";
$this->buildTempDir = PATH_DATA . "buildTemp";
} }
$this->utils->__set("logDir", $this->logDir); $this->utils->__set("logDir", $this->logDir);
$this->utils->refreshDir($this->buildTempDir); $this->utils->refreshDir($this->buildTempDir);

4
workflow/engine/methods/setup/pluginsChange.php
View File

@@ -88,10 +88,13 @@ if ($handle = opendir( PATH_PLUGINS )) {
} }
} }
closedir( $handle ); closedir( $handle );
/** /**
* Calls PMExtensionClass Builder to include Plugins changes. * Calls PMExtensionClass Builder to include Plugins changes.
*/ */
$config = Bootstrap::getSystemConfiguration();
if (!empty($config['experimental_features'])) {
$phpBuilder = new ProcessMakerPhpBuilderHelper(); $phpBuilder = new ProcessMakerPhpBuilderHelper();
$phpBuilder->enabledExtensions = $oPluginRegistry->getEnabledPlugins(); $phpBuilder->enabledExtensions = $oPluginRegistry->getEnabledPlugins();
if (!empty($phpBuilder->enabledExtensions)) { if (!empty($phpBuilder->enabledExtensions)) {
@@ -99,6 +102,7 @@ if ($handle = opendir( PATH_PLUGINS )) {
} }
$phpBuilder->buildAll(); $phpBuilder->buildAll();
} }
}
//$oPluginRegistry->showArrays(); //$oPluginRegistry->showArrays();
//G::Header('location: pluginsList'); //G::Header('location: pluginsList');