Merge branch 'feature/HOR-3769' of bitbucket.org:colosa/processmaker into feature/HOR-3769-P

# especially if it merges an updated upstream into a topic branch.
This commit is contained in:
Paula Quispe
2017-08-25 16:36:56 -04:00
4 changed files with 106 additions and 162 deletions

View File

@@ -41,7 +41,6 @@
"libchart/libchart": "1.4.0",
"indeyets/pake": "1.99.*",
"phpmailer/phpmailer": "5.2.*",
"tecnickcom/tcpdf": "6.2.*",
"pear/archive_tar": "1.4.*",
"pear/console_getopt": "1.4.*",
"TYPO3/class-alias-loader": "^1.0"

255
composer.lock generated

File diff suppressed because it is too large Load Diff

View File

@@ -2,6 +2,7 @@
namespace Maveriks;
use Bootstrap;
use Maveriks\Util;
use ProcessMaker\Core\System;
use ProcessMaker\Plugins\PluginRegistry;
@@ -487,9 +488,9 @@ class WebApplication
app()->make(Kernel::class)->bootstrap();
error_reporting(error_reporting() & ~E_STRICT & ~E_DEPRECATED);
\Bootstrap::setLanguage();
Bootstrap::setLanguage();
\Bootstrap::LoadTranslationObject((defined("SYS_LANG")) ? SYS_LANG : "en");
Bootstrap::LoadTranslationObject((defined("SYS_LANG")) ? SYS_LANG : "en");
if (empty($workspace)) {
return true;
@@ -585,6 +586,11 @@ class WebApplication
define('TIME_ZONE', ini_get('date.timezone'));
$oPluginRegistry = PluginRegistry::loadSingleton();
$attributes = $oPluginRegistry->getAttributes();
Bootstrap::LoadTranslationPlugins(defined('SYS_LANG') ? SYS_LANG : "en", $attributes);
// Initialization functions plugins
$oPluginRegistry->init();
//Return
return true;
}

View File

@@ -694,7 +694,7 @@ class Bootstrap
// Include also the extendGulliverClass that could have some
// new definitions for fields
if (file_exists($possiblePath . 'classes' . PATH_SEP . 'class.extendGulliver.php')) {
include_once $possiblePath . 'classes' . PATH_SEP . 'class.extendGulliver.php';
}
}
}