Completed
Pull Request — master (#1854)
by Rico
08:40
created
app/Module/TopSurnamesModule.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -72,7 +72,7 @@
 block discarded – undo
72 72
 
73 73
         extract($cfg, EXTR_OVERWRITE);
74 74
 
75
-         // Use the count of base surnames.
75
+            // Use the count of base surnames.
76 76
         $top_surnames = Database::prepare(
77 77
             "SELECT n_surn FROM `##name`" .
78 78
             " WHERE n_file = :tree_id AND n_type != '_MARNM' AND n_surn NOT IN ('@N.N.', '')" .
Please login to merge, or discard this patch.
resources/views/admin/trees-preferences.php 1 patch
Indentation   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -706,7 +706,7 @@  discard block
 block discarded – undo
706 706
         <?= view('components/radios-no-yes',['name' => 'EXPAND_NOTES', 'value' => $tree->getPreference('EXPAND_NOTES')]) ?>
707 707
 				<p class="small text-muted">
708 708
 					<?= /* I18N: Help text for the “Automatically expand notes” configuration setting */
709
-					I18N::translate('This option controls whether or not to automatically display content of a <i>Note</i> record on the Individual page.') ?>
709
+                    I18N::translate('This option controls whether or not to automatically display content of a <i>Note</i> record on the Individual page.') ?>
710 710
 				</p>
711 711
 			</div>
712 712
 		</div>
@@ -722,7 +722,7 @@  discard block
 block discarded – undo
722 722
         <?= view('components/radios-no-yes',['name' => 'EXPAND_SOURCES', 'value' => $tree->getPreference('EXPAND_SOURCES')]) ?>
723 723
 				<p class="small text-muted">
724 724
 					<?= /* I18N: Help text for the “Automatically expand sources” configuration setting */
725
-					I18N::translate('This option controls whether or not to automatically display content of a <i>Source</i> record on the Individual page.') ?>
725
+                    I18N::translate('This option controls whether or not to automatically display content of a <i>Source</i> record on the Individual page.') ?>
726 726
 				</p>
727 727
 			</div>
728 728
 		</div>
@@ -745,13 +745,13 @@  discard block
 block discarded – undo
745 745
 			</legend>
746 746
 			<div class="col-sm-9">
747 747
 				<?= /* I18N: The placeholders are edit controls. Show the [first/last] [1/2/3/4/5] parts of a place name */ I18N::translate(
748
-					'Show the %1$s %2$s parts of a place name.',
749
-					Bootstrap4::select([
750
-						'0' => I18N::translateContext('Show the [first/last] [N] parts of a place name.', 'first'),
751
-						'1' => I18N::translateContext('Show the [first/last] [N] parts of a place name.', 'last'),
752
-					], $tree->getPreference('SHOW_PEDIGREE_PLACES_SUFFIX'), ['name' => 'SHOW_PEDIGREE_PLACES_SUFFIX']),
753
-					Bootstrap4::select(FunctionsEdit::numericOptions(range(1, 9)), $tree->getPreference('SHOW_PEDIGREE_PLACES'), ['name' => 'SHOW_PEDIGREE_PLACES'])
754
-				) ?>
748
+                    'Show the %1$s %2$s parts of a place name.',
749
+                    Bootstrap4::select([
750
+                        '0' => I18N::translateContext('Show the [first/last] [N] parts of a place name.', 'first'),
751
+                        '1' => I18N::translateContext('Show the [first/last] [N] parts of a place name.', 'last'),
752
+                    ], $tree->getPreference('SHOW_PEDIGREE_PLACES_SUFFIX'), ['name' => 'SHOW_PEDIGREE_PLACES_SUFFIX']),
753
+                    Bootstrap4::select(FunctionsEdit::numericOptions(range(1, 9)), $tree->getPreference('SHOW_PEDIGREE_PLACES'), ['name' => 'SHOW_PEDIGREE_PLACES'])
754
+                ) ?>
755 755
 				<p class="small text-muted">
756 756
 					<?= /* I18N: Help text for the “Abbreviate place names” configuration setting */ I18N::translate('Place names are frequently too long to fit on charts, lists, etc. They can be abbreviated by showing just the first few parts of the name, such as <i>village, county</i>, or the last few part of it, such as <i>region, country</i>.') ?>
757 757
 				</p>
Please login to merge, or discard this patch.
app/Services/CalendarService.php 1 patch
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -327,9 +327,9 @@
 block discarded – undo
327 327
 
328 328
             // Now fetch these anniversaries
329 329
             foreach ([
330
-                         'INDI' => $ind_sql . $where . $order_by,
331
-                         'FAM'  => $fam_sql . $where . $order_by,
332
-                     ] as $type => $sql) {
330
+                            'INDI' => $ind_sql . $where . $order_by,
331
+                            'FAM'  => $fam_sql . $where . $order_by,
332
+                        ] as $type => $sql) {
333 333
                 $rows = Database::prepare($sql)->execute($args)->fetchAll();
334 334
                 foreach ($rows as $row) {
335 335
                     if ($type === 'INDI') {
Please login to merge, or discard this patch.
app/Http/Controllers/AdminLocationController.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -377,7 +377,7 @@
 block discarded – undo
377 377
 
378 378
                     // convert separate place fields into a comma separated placename
379 379
                     $fqdn = implode(Place::GEDCOM_SEPARATOR, array_filter(array_reverse(
380
-                                                                              \array_slice($row, 1, $fields - 5))));
380
+                                                                                \array_slice($row, 1, $fields - 5))));
381 381
 
382 382
                     $places[] = [
383 383
                         'pl_level' => $row[0],
Please login to merge, or discard this patch.
app/Bootstrap4.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -160,8 +160,8 @@
 block discarded – undo
160 160
         $html = '';
161 161
         foreach ($options as $value => $option) {
162 162
             $option_attributes = self::attributes([
163
-                                                      'value'    => $value,
164
-                                                      'selected' => \in_array((string)$value, $selected),
163
+                                                        'value'    => $value,
164
+                                                        'selected' => \in_array((string)$value, $selected),
165 165
             ]);
166 166
 
167 167
             $html .= '<option ' . $option_attributes . '>' . e($option) . '</option>';
Please login to merge, or discard this patch.