Merge branch 'dev' of bitbucket.org:jubilian/nhance into dev
This commit is contained in:
commit
0a9965e07f
@ -2639,7 +2639,7 @@ class EmployeeRestController extends AdminController
|
|||||||
$finalarray[$value] = $termsValue;
|
$finalarray[$value] = $termsValue;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if(is_array($terms->gpa_special_condition_label) && is_array($terms->gpa_special_condition_input)){
|
if(isset(($terms->gpa_special_condition_label)) && is_array($terms->gpa_special_condition_label) && is_array($terms->gpa_special_condition_input)){
|
||||||
for ($i=0; $i < count($terms->gpa_special_condition_label); $i++) {
|
for ($i=0; $i < count($terms->gpa_special_condition_label); $i++) {
|
||||||
$finalarray[$terms->gpa_special_condition_label[$i]] = $terms->gpa_special_condition_input[$i];
|
$finalarray[$terms->gpa_special_condition_label[$i]] = $terms->gpa_special_condition_input[$i];
|
||||||
}
|
}
|
||||||
@ -2661,7 +2661,7 @@ class EmployeeRestController extends AdminController
|
|||||||
$finalarray[$value] = $termsValue;
|
$finalarray[$value] = $termsValue;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if(is_array($terms->special_condition_label) && is_array($terms->special_condition_input)){
|
if(isset(($terms->special_condition_label)) && is_array($terms->special_condition_label) && is_array($terms->special_condition_input)){
|
||||||
for ($i=0; $i < count($terms->special_condition_label); $i++) {
|
for ($i=0; $i < count($terms->special_condition_label); $i++) {
|
||||||
$finalarray[$terms->special_condition_label[$i]] = $terms->special_condition_input[$i];
|
$finalarray[$terms->special_condition_label[$i]] = $terms->special_condition_input[$i];
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user