@@ -65,7 +65,7 @@ |
||
65 | 65 | return new Menu( |
66 | 66 | $this->getTitle(), |
67 | 67 | route('report-setup', ['ged' => $tree->getName(), |
68 | - 'report' => $this->getName(), |
|
68 | + 'report' => $this->getName(), |
|
69 | 69 | ]), |
70 | 70 | 'menu-report-' . $this->getName(), |
71 | 71 | ['rel' => 'nofollow'] |
@@ -65,7 +65,7 @@ |
||
65 | 65 | return new Menu( |
66 | 66 | $this->getTitle(), |
67 | 67 | route('report-setup', ['ged' => $tree->getName(), |
68 | - 'report' => $this->getName(), |
|
68 | + 'report' => $this->getName(), |
|
69 | 69 | ]), |
70 | 70 | 'menu-report-' . $this->getName(), |
71 | 71 | ['rel' => 'nofollow'] |
@@ -65,7 +65,7 @@ |
||
65 | 65 | return new Menu( |
66 | 66 | $this->getTitle(), |
67 | 67 | route('report-setup', ['ged' => $tree->getName(), |
68 | - 'report' => $this->getName(), |
|
68 | + 'report' => $this->getName(), |
|
69 | 69 | ]), |
70 | 70 | 'menu-report-' . $this->getName(), |
71 | 71 | ['rel' => 'nofollow'] |
@@ -65,7 +65,7 @@ |
||
65 | 65 | return new Menu( |
66 | 66 | $this->getTitle(), |
67 | 67 | route('report-setup', ['ged' => $tree->getName(), |
68 | - 'report' => $this->getName(), |
|
68 | + 'report' => $this->getName(), |
|
69 | 69 | ]), |
70 | 70 | 'menu-report-' . $this->getName(), |
71 | 71 | ['rel' => 'nofollow'] |
@@ -65,7 +65,7 @@ |
||
65 | 65 | return new Menu( |
66 | 66 | $this->getTitle(), |
67 | 67 | route('report-setup', ['ged' => $tree->getName(), |
68 | - 'report' => $this->getName(), |
|
68 | + 'report' => $this->getName(), |
|
69 | 69 | ]), |
70 | 70 | 'menu-report-' . $this->getName(), |
71 | 71 | ['rel' => 'nofollow'] |
@@ -342,9 +342,11 @@ |
||
342 | 342 | 'fqpn', |
343 | 343 | ]; |
344 | 344 | |
345 | - if ($serverfile !== '') { // first choice is file on server |
|
345 | + if ($serverfile !== '') { |
|
346 | +// first choice is file on server |
|
346 | 347 | $filename = WT_DATA_DIR . 'places/' . $serverfile; |
347 | - } elseif ($_FILES['localfile']['error'] === UPLOAD_ERR_OK) { // 2nd choice is local file |
|
348 | + } elseif ($_FILES['localfile']['error'] === UPLOAD_ERR_OK) { |
|
349 | +// 2nd choice is local file |
|
348 | 350 | $filename = $_FILES['localfile']['tmp_name']; |
349 | 351 | } |
350 | 352 |
@@ -241,7 +241,7 @@ |
||
241 | 241 | ], |
242 | 242 | 'CEME' => [ |
243 | 243 | // CEME is NOT a valid 5.5.1 tag |
244 | - //'BURI', |
|
244 | + //'BURI', |
|
245 | 245 | ], |
246 | 246 | 'RELA' => [ |
247 | 247 | 'ASSO', |
@@ -345,10 +345,10 @@ |
||
345 | 345 | } |
346 | 346 | // print gedcom ages |
347 | 347 | foreach ([ |
348 | - I18N::translate('Age') => $fact_age, |
|
349 | - I18N::translate('Husband') => $husb_age, |
|
350 | - I18N::translate('Wife') => $wife_age, |
|
351 | - ] as $label => $age) { |
|
348 | + I18N::translate('Age') => $fact_age, |
|
349 | + I18N::translate('Husband') => $husb_age, |
|
350 | + I18N::translate('Wife') => $wife_age, |
|
351 | + ] as $label => $age) { |
|
352 | 352 | if ($age != '') { |
353 | 353 | $html .= ' <span class="label">' . $label . ':</span> <span class="age">' . FunctionsDate::getAgeAtEvent($age) . '</span>'; |
354 | 354 | } |
@@ -840,9 +840,9 @@ |
||
840 | 840 | } |
841 | 841 | |
842 | 842 | foreach ([ |
843 | - 'main' => $main_blocks, |
|
844 | - 'side' => $side_blocks, |
|
845 | - ] as $location => $updated_blocks) { |
|
843 | + 'main' => $main_blocks, |
|
844 | + 'side' => $side_blocks, |
|
845 | + ] as $location => $updated_blocks) { |
|
846 | 846 | foreach ($updated_blocks as $block_order => $block_id) { |
847 | 847 | if (is_numeric($block_id)) { |
848 | 848 | // Updated block |