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

Merge branch 'master' into michael-angelo

Browse Source
This commit is contained in:
Erik Amaru Ortiz
2013-08-21 11:20:24 -04:00
parent 5eb525c1d3 45e7e9fc74
commit 982309457d
4 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
workflow/engine/classes/class.case.php
View File

@@ -4946,7 +4946,7 @@ class Cases
G::verifyPath($pathEmail, true); //Create if it does not exist
$fileTemplate = $pathEmail . G::LoadTranslation('ID_UNASSIGNED_MESSAGE');
if (!file_exists($fileTemplate)) {
if ((!file_exists($fileTemplate)) && file_exists(PATH_TPL . "mails" . PATH_SEP . G::LoadTranslation('ID_UNASSIGNED_MESSAGE'))) {
@copy(PATH_TPL . "mails" . PATH_SEP . G::LoadTranslation('ID_UNASSIGNED_MESSAGE'), $fileTemplate);
}

2
workflow/engine/classes/class.processes.php
View File

@@ -3865,7 +3865,7 @@ class Processes
@copy( PATH_TPL . "mails" . PATH_SEP . "alert_message.html", $dir . "alert_message.html" );
}
if (! file_exists( $dir . "unassignedMessage.html" )) {
if ( (!file_exists( $dir . "unassignedMessage.html")) && file_exists($dir . G::LoadTranslation('ID_UNASSIGNED_MESSAGE'))) {
if (defined('PARTNER_FLAG')) {
@copy( PATH_TPL . "mails" . PATH_SEP . "unassignedMessagePartner.html", $dir . G::LoadTranslation('ID_UNASSIGNED_MESSAGE'));
} else {

1
workflow/engine/classes/model/Language.php
View File

@@ -644,6 +644,7 @@ class Language extends BaseLanguage
$trn = new Translation();
$trn->generateFileTranslationPlugin( $plugin, $idLanguage );
$trn->addTranslationEnvironmentPlugins( $plugin, $idLanguage, $POHeaders, $countItemsSuccess );
$languageID = (isset($languageID)) ? $languageID : $idLanguage;
//fill the results
$results = new stdClass();

2
workflow/engine/menus/setup.php
View File

@@ -70,7 +70,7 @@ if (!$partnerFlag) {
//tools options
if ($RBAC->userCanAccess('PM_SETUP_ADVANCE') == 1 ) {
if (!$partnerFlag) {
$G_TMP_MENU->AddIdRawOption('PLUGINS', 'pluginsMain', 'Plugins Manager', 'icon-plugins.png', '', 'plugins');
$G_TMP_MENU->AddIdRawOption('PLUGINS', 'pluginsMain', G::LoadTranslation('ID_PLUGINS_MANAGER'), 'icon-plugins.png', '', 'plugins');
}
}