Merged in bugfix/HOR-4547 (pull request #6464)

HOR-4547

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
This commit is contained in:
Paula Quispe
2018-05-11 20:26:34 +00:00
committed by Julio Cesar Laura Avendaño
20 changed files with 59 additions and 33 deletions

View File

@@ -10,7 +10,7 @@ class AppAssignSelfServiceValue extends BaseAppAssignSelfServiceValue
*
* return void
*/
public function create($applicationUid, $delIndex, array $arrayData, $dataVariable)
public function create($applicationUid, $delIndex, array $arrayData, $dataVariable = [])
{
try {
$cnn = Propel::getConnection(AppAssignSelfServiceValuePeer::DATABASE_NAME);

View File

@@ -571,7 +571,8 @@ class Language extends BaseLanguage
$buildhash = file_get_contents($buildhash);
$michelangeloFE = PATH_HTML . "lib/js";
$pathFileMafe = array_pop(glob($michelangeloFE . '/' . '*' . $buildhash . '*', GLOB_BRACE));
$array = glob($michelangeloFE . '/' . '*' . $buildhash . '*', GLOB_BRACE);
$pathFileMafe = array_pop($array);
if (file_exists($pathFileMafe) && is_readable($pathFileMafe)) {
$labels = self::readLabelsDirectory($pathFileMafe, true);
}