@@ -1,6 +1,6 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | 3 | return array ( |
| 4 | - '%H:%i:%s' => '%g:%i:%s %a', |
|
| 5 | - '%j %F %Y' => '%F %j, %Y', |
|
| 4 | + '%H:%i:%s' => '%g:%i:%s %a', |
|
| 5 | + '%j %F %Y' => '%F %j, %Y', |
|
| 6 | 6 | ); |
@@ -286,9 +286,9 @@ |
||
| 286 | 286 | $options = []; |
| 287 | 287 | $individuals = new Collection(); |
| 288 | 288 | $families = $individual->childFamilies() |
| 289 | - ->merge($individual->childStepFamilies()) |
|
| 290 | - ->merge($individual->spouseFamilies()) |
|
| 291 | - ->merge($individual->spouseStepFamilies()); |
|
| 289 | + ->merge($individual->childStepFamilies()) |
|
| 290 | + ->merge($individual->spouseFamilies()) |
|
| 291 | + ->merge($individual->spouseStepFamilies()); |
|
| 292 | 292 | |
| 293 | 293 | $families->each(function ($family) use (&$individuals) { |
| 294 | 294 | $individuals = $individuals |